Merge remote-tracking branch 'origin/debian' into debian debian
authorEvgeni Golov <evgeni@grml.org>
Thu, 7 Jan 2016 08:01:17 +0000 (09:01 +0100)
committerEvgeni Golov <evgeni@grml.org>
Thu, 7 Jan 2016 08:01:17 +0000 (09:01 +0100)

Trivial merge