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)

Trivial merge