[hurd] 01/01: Merge branch 'dde-upstream' into eth

[Samuel Thibault]

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

sthibault pushed a commit to branch eth
in repository hurd.

commit b5a055b919a29baf91334f288ba4d779288a08e2
Merge: 8bc7321 120e653
Author: Samuel Thibault <address@hidden>
Date:   Mon Sep 23 22:34:52 2013 +0000

    Merge branch 'dde-upstream' into eth
    
    Conflicts:
        devnode/devnode.c
        libddekit/pgtab.c
        libmachdev/ds_routines.c

 eth-filter/filter.c           |    9 ++++++---
 eth-multiplexer/device_impl.c |    4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

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