[erfa] 03/03: Merge branch 'debian' of git+ssh://git.debian.org/git/debian-science/packages/erfa into debian

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository erfa.

commit 09d1754019d814bdeebbf516e1d73448648e6a83
Merge: 4bc2562 5716d24
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Nov 26 20:19:05 2013 +0100

    Merge branch 'debian' of git+ssh://git.debian.org/git/debian-science/packages/erfa into debian
    
    Conflicts:
    	debian/changelog

 debian/control | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

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