[mig] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-hurd/mig

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository mig.

commit c9c1b2dca5be97f68c1e95530dfbf32fecfd0fa0
Merge: b418a8d 96194c6
Author: Samuel Thibault <address@hidden>
Date:   Sun Nov 9 15:14:54 2014 +0000

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-hurd/mig
    
    Conflicts:
        debian/changelog

 debian/changelog | 6 +++++-
 debian/control   | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 47c14d4,fe0d5b7..021e4c1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,8 +1,15 @@@
 -mig (1.4-3) UNRELEASED; urgency=medium
 +mig (1.4-3) unstable; urgency=medium
  
++  [ Samuel Thibault ]
 +  * patches/git-c-strings.patch: Upstream patch to fix variable-sized c
 +    strings.
 +  * patches/git-protected-payload.patch: Upstream patch to add protected 
payload
 +    support.
 +
-  -- Samuel Thibault <address@hidden>  Sun, 09 Nov 2014 14:51:54 +0000
++  [ Guillem Jover ]
+   * Remove myself from Uploaders.
+ 
 - -- Guillem Jover <address@hidden>  Tue, 04 Mar 2014 06:49:03 +0100
++ -- Samuel Thibault <address@hidden>  Sun, 09 Nov 2014 15:14:41 +0000
  
  mig (1.4-2) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/mig.git