[med-svn] [camp] branch master updated (2a7a16a -> 61158ff)

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a change to branch master
in repository camp.

      from  2a7a16a   Add proper conflicts with previous version. Closes #876147
       new  61158ff   Add missing colon, upload to unstable

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/camp.git