fix changelog after merge
authorEvgeni Golov <evgeni@grml.org>
Wed, 6 Jan 2016 17:07:02 +0000 (18:07 +0100)
committerEvgeni Golov <evgeni@grml.org>
Wed, 6 Jan 2016 17:07:02 +0000 (18:07 +0100)

No differences found