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

commit 01e195efa7c86a2436bb412889fa6e42bb4c7c1e
Merge: 948db97 e71afa7
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Oct 28 17:07:32 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-science/packages/cpl-plugin-giraf.git