Merge branch 'master' of github.com:dopefishh/des2015
authorMart Lubbers <mart@martlubbers.net>
Tue, 5 Jan 2016 11:04:48 +0000 (12:04 +0100)
committerMart Lubbers <mart@martlubbers.net>
Tue, 5 Jan 2016 11:04:48 +0000 (12:04 +0100)

Trivial merge