Merge remote-tracking branch 'live-systems/debian' into debian
authorEvgeni Golov <evgeni@grml.org>
Wed, 10 Dec 2014 11:35:00 +0000 (12:35 +0100)
committerEvgeni Golov <evgeni@grml.org>
Wed, 10 Dec 2014 11:35:00 +0000 (12:35 +0100)

Trivial merge