Merge branch 'master' of lisas.de:/home/staff/alex/.public_html/tX/src/terminatorX
authorAlexander Koenig <alex@lisas.de>
Sun, 8 May 2016 13:36:48 +0000 (15:36 +0200)
committerAlexander Koenig <alex@lisas.de>
Sun, 8 May 2016 13:36:48 +0000 (15:36 +0200)

Trivial merge