[libsfml] 03/03: Merge branch 'upstream'

[James Cowgill]

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

jcowgill-guest pushed a commit to branch master
in repository libsfml.

commit 663dbb77d6e28a2386f873e192e80ad5aa3acacd
Merge: f1e8bb4 c8f7e7b
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sat May 9 16:26:46 2015 +0100

    Merge branch 'upstream'

 examples/sound/resources/ding.flac | Bin 0 -> 61764 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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