[hurd] 02/04: 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 9ffebe66ab1b81b5d1c8010e28a662ce9168be2a
Merge: 036dd8e 905d9ca
Author: Samuel Thibault <address@hidden>
Date:   Wed Mar 23 17:37:40 2016 +0000

    Merge branch 'upstream-merged'

 ext2fs/pager.c         |   2 +-
 libfshelp/fetch-root.c |   3 +-
 pflocal/Makefile       |   4 +-
 pflocal/fs.c           | 308 +++++++++++++++++++++++++++++++++++++++++++++++++
 pflocal/mig-mutate.h   |   6 +
 pflocal/sserver.c      |   2 +
 6 files changed, 321 insertions(+), 4 deletions(-)

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