[med-svn] [tophat] 01/02: Merge tag 'debian/2.1.0+dfsg-1' into debian/jessie-backports

[Charles Plessy]

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

plessy pushed a commit to annotated tag debian/2.1.0+dfsg-1_bpo8+1
in repository tophat.

commit af547dbd6f331fe8580cf990d7f1e25719edc4d6
Merge: e2e5a03 6e7541f
Author: Charles Plessy <plessy at debian.org>
Date:   Wed Feb 17 09:23:06 2016 +0900

    Merge tag 'debian/2.1.0+dfsg-1' into debian/jessie-backports
    
    Conflicts:
    	debian/changelog

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

diff --cc debian/changelog
index c717845,06d03d3..6bed881
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,4 +1,11 @@@
 +tophat (2.1.0+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Team upload.
 +  * Rebuild for jessie-backports.
 +
 + -- Charles Plessy <plessy at debian.org>  Thu, 11 Feb 2016 21:36:04 +0900
 +
- tophat (2.1.0+dfsg-1) UNRELEASED; urgency=medium
+ tophat (2.1.0+dfsg-1) unstable; urgency=medium
  
    * New upstream version
  

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