Merge commit 'e887b2ef14c8e00908310653e452d6f9247ea80d' MT2016-12-12
authorBernhard Tittelbach <bernhard@tittelbach.org>
Tue, 13 Dec 2016 18:21:27 +0000 (19:21 +0100)
committerBernhard Tittelbach <bernhard@tittelbach.org>
Tue, 13 Dec 2016 18:21:27 +0000 (19:21 +0100)

Trivial merge