Merge remote-tracking branch 'deb/debian' into debian
authorEvgeni Golov <evgeni@grml.org>
Mon, 26 Nov 2012 06:56:36 +0000 (07:56 +0100)
committerEvgeni Golov <evgeni@grml.org>
Mon, 26 Nov 2012 06:56:36 +0000 (07:56 +0100)

Trivial merge