Merge tag 'debian/1%20151213' into debian
authorEvgeni Golov <evgeni@grml.org>
Wed, 6 Jan 2016 17:02:05 +0000 (18:02 +0100)
committerEvgeni Golov <evgeni@grml.org>
Wed, 6 Jan 2016 17:02:05 +0000 (18:02 +0100)
Debian 1:20151213 release


Trivial merge