Merge branch 'master' of github.com:dopefishh/des2015
authorMart Lubbers <mart@martlubbers.net>
Thu, 8 Oct 2015 18:07:31 +0000 (20:07 +0200)
committerMart Lubbers <mart@martlubbers.net>
Thu, 8 Oct 2015 18:07:31 +0000 (20:07 +0200)

Trivial merge