[triplea] 03/04: Merge branch 'merge_to_unstable_upstream' into merge_to_unstable

[Scott Sheridan Howard]

This is an automated email from the git hooks/post-receive script.

showard pushed a commit to branch master
in repository triplea.

commit 7bff42791c486b018bc7f28ed1ae7bcf9f4cea69
Merge: ad7d1f9 2ef9032
Author: Scott Howard <showard314 at gmail.com>
Date:   Sun Jan 19 12:08:45 2014 -0500

    Merge branch 'merge_to_unstable_upstream' into merge_to_unstable

 doc/images/project-support.jpg | Bin 3788 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/triplea.git