[Debian-astro-commits] [iraf] 01/01: Merge branch 'upstream'

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository iraf.

commit 2d75fc45c01dcffac4e2f8834788f8f4afd5e45c
Merge: 2391f20 204261b
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Dec 5 21:26:20 2017 +0100

    Merge branch 'upstream'


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