[hurd] 01/01: Merge branch 'master' of git.debian.org:/git/pkg-hurd/hurd

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository hurd.

commit 21665626ab29c1cfa4b8eb1618c3d877b5d2e41e
Merge: e417a3f 3888e7f
Author: Samuel Thibault <address@hidden>
Date:   Fri May 30 18:34:33 2014 +0000

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

 debian/changelog                       |  8 +++++++
 debian/patches/git-random_buffer.patch | 39 ++++++++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 48 insertions(+)

diff --cc debian/changelog
index 0fd38dc,d3fb8c5..b4a205c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,18 @@@
 -hurd (1:0.5.git20140526-2) UNRELEASED; urgency=medium
 -
 -  [ Gabriele Giacone ]
 -  * patches/mount-bind.patch: Fix uninitialized value.
++hurd (1:0.5.git20140526-3) UNRELEASED; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * patches/git-random_buffer.patch: Fix random translator crash during
+     heimdal testsuite.
+ 
+  -- Samuel Thibault <address@hidden>  Tue, 27 May 2014 22:06:43 +0200
+ 
 +hurd (1:0.5.git20140526-2) unstable; urgency=medium
 +
 +  [ Gabriele Giacone ]
 +  * patches/mount-bind.patch: Fix uninitialized value.
 +
 + -- Samuel Thibault <address@hidden>  Tue, 27 May 2014 20:08:08 +0000
 +
  hurd (1:0.5.git20140526-1) unstable; urgency=medium
  
    [ Samuel Thibault ]

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