[wcslib] 02/02: Merge branch 'debian' into debian-contrib

[Ole Streicher]

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

olebole pushed a commit to branch debian-contrib
in repository wcslib.

commit 942c8e048c4e352bf3443f49e85e5ae31d645f51
Merge: 8c94f9a 5ca8091
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Jan 7 14:00:09 2015 +0100

    Merge branch 'debian' into debian-contrib
    
    Conflicts:
    	debian/changelog
    	debian/control


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/wcslib.git