Merge branch 'master' of git@github.com:dopefishh/des2015
authorroot <root@xenomailinux.localdomain>
Sat, 12 Sep 2015 10:58:27 +0000 (12:58 +0200)
committerroot <root@xenomailinux.localdomain>
Sat, 12 Sep 2015 10:58:27 +0000 (12:58 +0200)

Trivial merge