[med-svn] [jellyfish1] 03/06: Merge remote-tracking branch 'origin/master'

[Andreas Tille]

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

tille pushed a commit to tag debian/2.2.4-1
in repository jellyfish1.

commit 37487e78299d5cb2bf4a058da698f1d2b13118fe
Merge: 13e553a 09e9942
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 10 21:49:56 2015 +0100

    Merge remote-tracking branch 'origin/master'

 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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