[Debian-astro-commits] [cpl-plugin-template] 41/81: 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-template.

commit 40057decd7b7b27aa6e80e8a40d7f71856c24b3b
Merge: f8ba350 e71afa7
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Oct 28 17:02:11 2013 +0100

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/cpl-plugin.doc-base.in

 debian/cpl-plugin.doc-base.in | 23 +++++++++--------
 debian/create_sphinx.py       | 59 +++++++++++++++++++++++++++----------------
 2 files changed, 50 insertions(+), 32 deletions(-)


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