Merge branch 'master' of github.com:dopefishh/des2015
authorMart Lubbers <mart@martlubbers.net>
Thu, 15 Oct 2015 15:09:33 +0000 (17:09 +0200)
committerMart Lubbers <mart@martlubbers.net>
Thu, 15 Oct 2015 15:09:33 +0000 (17:09 +0200)

Trivial merge