[cpl-plugin-amber] 02/02: Merge branch 'debian-template' into debian
Ole Streicher
olebole-guest at alioth.debian.org
Mon Oct 28 21:53:50 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository cpl-plugin-amber.
commit 2ddb3eb427183aafa173d6526247f27df19a7bfd
Merge: a2544ed f8add71
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Oct 28 22:53:32 2013 +0100
Merge branch 'debian-template' into debian
Conflicts:
debian/cpl-plugin.doc-base.in
debian/cpl-plugin.doc-base.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-amber.git
More information about the debian-science-commits
mailing list