Merge branch 'master' of github.com:dopefishh/ker2014-2
authorMart Lubbers <mart@martlubbers.net>
Tue, 6 Jan 2015 09:39:39 +0000 (10:39 +0100)
committerMart Lubbers <mart@martlubbers.net>
Tue, 6 Jan 2015 09:39:39 +0000 (10:39 +0100)

Trivial merge