Merge pull request #80 from Nauxuron/master
authorFelix Morgner <felix.morgner@gmail.com>
Thu, 26 Jan 2017 12:12:25 +0000 (13:12 +0100)
committerFelix Morgner <felix.morgner@gmail.com>
Thu, 26 Jan 2017 12:12:25 +0000 (13:12 +0100)

Trivial merge