[hurd] 33/36: Merge remote-tracking branch 'upstream/master' into upstream

[Samuel Thibault]

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

sthibault pushed a commit to branch upstream
in repository hurd.

commit 574d76e0320d211e14e3f36fa98bf86aebb60122
Merge: 3150166 3aee8e4
Author: Samuel Thibault <address@hidden>
Date:   Tue Sep 24 07:37:37 2013 +0000

    Merge remote-tracking branch 'upstream/master' into upstream

 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