Merge remote-tracking branch 'live-systems/debian-next' into debian
authorEvgeni Golov <evgeni@golov.de>
Thu, 28 Aug 2014 15:23:17 +0000 (17:23 +0200)
committerEvgeni Golov <evgeni@golov.de>
Thu, 28 Aug 2014 15:23:17 +0000 (17:23 +0200)

Trivial merge