[Debian-astro-commits] [saods9] 01/05: Merge branch 'upstream' into debian

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository saods9.

commit d0183ef121f7089e3a44d0d2170469cc945e4380
Merge: caf588b b5368e7
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Mar 17 20:53:36 2016 +0100

    Merge branch 'upstream' into debian

 ds9/library/ds9.tcl | 1 +
 unix/configure      | 2 +-
 unix/configure.in   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

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