[saods9] 01/01: Merge branch 'debian-sid' 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 saods9.

commit af286372ee025d8e4f7bc2709ef6e6f99c5e63d4
Merge: ebe703d 4ba030a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Oct 5 16:38:19 2014 +0200

    Merge branch 'debian-sid' into debian
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/ds9_make_linux.patch
    	debian/patches/ds9_use_external_libs.patch


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