[pkg-fgfs-crew] [flightgear-data] 02/02: Merge branch 'master' of git://anonscm.debian.org/collab-maint/flightgear-data

[Markus Wanner]

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

markus_wanner-guest pushed a commit to branch master
in repository flightgear-data.

commit e845a9c48a49a1d853a1ccb981ee980bdfd1e8d0
Merge: fcddf17 2534072
Author: Markus Wanner <markus at bluegap.ch>
Date:   Sat Sep 21 21:06:38 2013 +0200

    Merge branch 'master' of git://anonscm.debian.org/collab-maint/flightgear-data
    
    Conflicts:
    	debian/changelog
    	debian/control


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/flightgear-data.git