[erfa] 01/03: Merge branch 'upstream' 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 f3e647fb37b98038f6ed51751e015d7173c83337
Merge: 68766d3 312b2c1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Nov 13 19:16:20 2013 +0100

    Merge branch 'upstream' into debian
    
    Conflicts:
    	RELEASE.rst
    	configure.ac
    	src/Makefile.am

 RELEASE.rst     | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 configure.ac    |   8 +++-
 src/Makefile.am |  15 +-------
 3 files changed, 115 insertions(+), 22 deletions(-)

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