Merge branch 'master' of github.com:dopefishh/bachelor
authorMart Lubbers <mart@martlubbers.net>
Thu, 1 May 2014 06:47:02 +0000 (08:47 +0200)
committerMart Lubbers <mart@martlubbers.net>
Thu, 1 May 2014 06:47:02 +0000 (08:47 +0200)

Trivial merge