[med-svn] [bedtools] 05/05: Merge branch 'debian/unstable' of ssh://git.debian.org/git/debian-med/bedtools into debian/unstable

[Andreas Tille]

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

tille pushed a commit to branch debian/unstable
in repository bedtools.

commit 08063adef7192151dca127f02835affad9b8d996
Merge: 06f0ad1 dc2a4a4
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jun 6 22:19:45 2014 +0200

    Merge branch 'debian/unstable' of ssh://git.debian.org/git/debian-med/bedtools into debian/unstable
    
    Conflicts:
    	debian/changelog

 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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