[hurd] 05/06: 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 6e3fb0a35ba71d6b71a54f358766d6498cb3ca01
Merge: 263b054 9e4ac1e
Author: Samuel Thibault <address@hidden>
Date:   Sun Nov 20 19:57:26 2016 +0000

    Merge branch 'upstream-merged'

 libpager/pager-memcpy.c | 2 +-
 libstore/memobj.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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