[Debian-astro-commits] [cpl-plugin-xsh] 03/03: Merge branch 'debian-template' 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 cpl-plugin-xsh.

commit 1467f7c432d9974b2fd39804173f24702b832afd
Merge: 48110e8 739abd4
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jul 20 15:50:28 2015 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/create_sphinx.py

 debian/create_sphinx.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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