[med-svn] [daligner] 05/06: Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/daligner

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository daligner.

commit 49a28dc2c86caf0c787efcc8056ceedc7ac739b0
Merge: dfb40ce 7a5d5bb
Author: Afif Elghraoui <afif at debian.org>
Date:   Thu Oct 19 23:21:51 2017 -0400

    Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/daligner

 debian/changelog         | 6 ++++++
 debian/upstream/metadata | 7 +++++++
 2 files changed, 13 insertions(+)

diff --cc debian/changelog
index 3726866,2db9458..ceee398
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,17 @@@
 +daligner (1.0+20171010-1) unstable; urgency=medium
 +
 +  * New upstream snapshot (git b966696)
 +  * Bump Standards Version to 4.1.1
 +  * Bump copyright years
 +
 + -- Afif Elghraoui <afif at debian.org>  Thu, 19 Oct 2017 23:18:52 -0400
 +
+ daligner (1.0+20161119-2) UNRELEASED; urgency=medium
+ 
+   * [debian/upstream/metadata] Reference to OMICtools added.
+ 
+  -- Steffen Moeller <moeller at debian.org>  Fri, 21 Jul 2017 12:49:28 +0200
+ 
  daligner (1.0+20161119-1) unstable; urgency=medium
  
    * New upstream snapshot (git a9458dc)

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