[pygame-sdl2] 02/03: Merge tag 'upstream/6.99.12.1'

[Markus Koschany]

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

apo pushed a commit to branch master
in repository pygame-sdl2.

commit ab048afa0d48ce76645eada4d3f31d4e4218da90
Merge: 9b46e3c f63ee76
Author: Markus Koschany <apo at debian.org>
Date:   Sun Dec 25 03:46:53 2016 +0100

    Merge tag 'upstream/6.99.12.1'
    
    Upstream version 6.99.12.1
    
    # gpg: Signatur vom So 25 Dez 2016 03:46:53 CET
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 PKG-INFO                      | 2 +-
 pygame_sdl2.egg-info/PKG-INFO | 2 +-
 setup.cfg                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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