[SCM] Debian GNU Mach packaging branch, master, updated. debian/2%1.3.99.dfsg.git20120923-1-3-gf38f5eb

[Samuel Thibault]

The following commit has been merged in the master branch:
commit b62d6f9e967d650f29b27b4aec70dbba3d04e034
Merge: 6babeca476c5f3803320527521a5ac4c64fb4e44 
4aad110d2b2562635a87a586df6fbdc4744875d5
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date:   Mon Nov 19 16:56:04 2012 +0100

    Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach
    
    Conflicts:
        debian/patches/10_cdromlock.patch
        debian/patches/13_ide_dma.patch
        debian/patches/24_pci_irq_fix.patch


-- 
Debian GNU Mach packaging