Merge branch 'master' of https://github.com/dopefishh/tt2015
authormart <mart@lubbe.rs>
Sun, 15 Nov 2015 18:07:31 +0000 (19:07 +0100)
committermart <mart@lubbe.rs>
Sun, 15 Nov 2015 18:07:31 +0000 (19:07 +0100)

Trivial merge