Merge remote branch 'origin/master'
authorUlrich Dangel <uli@spamt.net>
Wed, 4 Nov 2009 10:06:57 +0000 (11:06 +0100)
committerUlrich Dangel <uli@spamt.net>
Wed, 4 Nov 2009 10:06:57 +0000 (11:06 +0100)
1  2 
grml2usb

diff --cc grml2usb
Simple merge