[med-svn] [praat] 04/05: Merge branch 'master' of git+ssh://anonscm.debian.org/git/debian-med/praat

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch master
in repository praat.

commit fbb2ce7f7c47ba5683c3d5050f60f701ba6cc0d2
Merge: 081cdfc b638635
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Wed Oct 8 11:58:33 2014 -0300

    Merge branch 'master' of git+ssh://anonscm.debian.org/git/debian-med/praat
    
    Conflicts:
    	debian/changelog


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/praat.git