[hurd] 10/13: Merge branch 'upstream-merged'

[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 14295d69efdb442e50b4b870e129e5bfd5a92a3c
Merge: 869f0cb 9b540b2
Author: Samuel Thibault <address@hidden>
Date:   Tue Sep 24 07:39:51 2013 +0000

    Merge branch 'upstream-merged'

 pflocal/sock.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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