Merge remote-tracking branch 'origin/libs/scrypt/local'
authorFelix Dörre <felix@dogcraft.de>
Sun, 1 Mar 2015 00:33:57 +0000 (01:33 +0100)
committerFelix Dörre <felix@dogcraft.de>
Sun, 1 Mar 2015 00:33:57 +0000 (01:33 +0100)

Trivial merge