Merge remote-tracking branch 'live-systems/debian' into debian
authorEvgeni Golov <evgeni@golov.de>
Thu, 10 Apr 2014 06:08:08 +0000 (08:08 +0200)
committerEvgeni Golov <evgeni@golov.de>
Thu, 10 Apr 2014 06:08:08 +0000 (08:08 +0200)

Trivial merge