Merge branch 'master' of github.com:dopefishh/des2015
authorMart Lubbers <mart@martlubbers.net>
Thu, 7 Jan 2016 14:09:44 +0000 (15:09 +0100)
committerMart Lubbers <mart@martlubbers.net>
Thu, 7 Jan 2016 14:09:44 +0000 (15:09 +0100)

Trivial merge