[hurd] 08/09: Merge branch 'dde-upstream' into dde

[Samuel Thibault]

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

sthibault pushed a commit to branch dde
in repository hurd.

commit 6964f9c8b2ca407afff5dbb122675ee69e768111
Merge: a4c5699 120e653
Author: Samuel Thibault <address@hidden>
Date:   Mon Sep 23 22:33:29 2013 +0000

    Merge branch 'dde-upstream' into dde
    
    Conflicts:
        eth-filter/filter.c
        eth-multiplexer/device_impl.c

 devnode/devnode.c        |    1 +
 libddekit/pgtab.c        |    1 +
 libmachdev/ds_routines.c |    2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

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