[med-svn] [gubbins] 02/07: Merge tag 'upstream/1.4.3'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository gubbins.

commit faa566d129450fea40fd658d2c17bd4aed074888
Merge: 6d36a3f be13c99
Author: Andreas Tille <tille at debian.org>
Date:   Thu Nov 19 11:36:47 2015 +0100

    Merge tag 'upstream/1.4.3'
    
    Upstream version 1.4.3
    
    Conflicts:
    	debian/control
    	debian/copyright
    	debian/rules

 debian/changelog => CHANGELOG |  0
 ChangeLog                     | 13 -------------
 VERSION                       |  2 +-
 debian/compat                 |  1 -
 4 files changed, 1 insertion(+), 15 deletions(-)


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