Merge remote-tracking branch 'deb/debian' into debian
authorEvgeni Golov <evgeni@grml.org>
Mon, 17 Dec 2012 14:46:42 +0000 (15:46 +0100)
committerEvgeni Golov <evgeni@grml.org>
Mon, 17 Dec 2012 14:46:42 +0000 (15:46 +0100)
commit04ecb83516c5795cf4a1da19cf73b90ebd8d2747
tree1dfc79f5888a78a27afd89b36e09104af2933e15
parentcd438f06901d6dbc2ca5c2be7dd3d5b03f4b7719
parent11df12900362833ecf8748132138f88f9ff80b7b
Merge remote-tracking branch 'deb/debian' into debian