Merge remote-tracking branch 'live-systems/debian' into debian
authorEvgeni Golov <evgeni@grml.org>
Sat, 8 Mar 2014 12:08:04 +0000 (13:08 +0100)
committerEvgeni Golov <evgeni@grml.org>
Sat, 8 Mar 2014 12:08:04 +0000 (13:08 +0100)

Trivial merge