[python-sfml] 07/08: Merge branch 'master' into experimental

[James Cowgill]

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

jcowgill-guest pushed a commit to branch experimental
in repository python-sfml.

commit 076238c64654aae751e9e9c3ede83974d9a435d0
Merge: b669bc2 548460b
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Mon May 18 14:36:30 2015 +0100

    Merge branch 'master' into experimental

 debian/changelog                     | 24 ++++++++++++++++++------
 debian/control                       |  2 +-
 debian/python-sfml-doc.README.Debian | 34 ----------------------------------
 debian/rules                         |  2 ++
 4 files changed, 21 insertions(+), 41 deletions(-)


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