Merge branch 'master' of https://github.com/dopefishh/tt2015
authormart <mart@lubbe.rs>
Wed, 11 Nov 2015 12:36:32 +0000 (13:36 +0100)
committermart <mart@lubbe.rs>
Wed, 11 Nov 2015 12:36:32 +0000 (13:36 +0100)

Trivial merge