[cpl-plugin-sinfo] 02/02: 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-sinfo.

commit 443097088d7480995b335379e3de85b2a75e2e95
Merge: f78ca87 e1d879b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jul 2 14:45:23 2014 +0200

    Merge branch 'debian-template' into debian
    
    Conflicts:
    	debian/patches/fix_test_fail.patch

 debian/patches/fix_test_fail.patch | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

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