Merge remote-tracking branch 'live-systems/debian' into debian
authorEvgeni Golov <evgeni@grml.org>
Sun, 26 Oct 2014 10:28:27 +0000 (11:28 +0100)
committerEvgeni Golov <evgeni@grml.org>
Sun, 26 Oct 2014 10:28:27 +0000 (11:28 +0100)

Trivial merge