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)
commit993672a463ceb6c4f29100ab3e40ff151e0e5ec5
treed7e2f656273a7542cdee4eea5b426f7965ecf526
parentc8886f8f148c4d130a65ced7d39cec749f34c7d8
parent144c84752e5f2ecafe658cc67a6cd888f00b155e
Merge remote-tracking branch 'origin/debian' into debian