Merge remote-tracking branch 'live-systems/debian' into debian-next
authorEvgeni Golov <sargentd@die-welt.net>
Mon, 12 Aug 2013 17:16:19 +0000 (19:16 +0200)
committerEvgeni Golov <sargentd@die-welt.net>
Mon, 12 Aug 2013 17:16:19 +0000 (19:16 +0200)

Trivial merge