From: Felix Dörre <felix@dogcraft.de>
Date: Sun, 1 Mar 2015 00:33:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/libs/scrypt/local'
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=ec24cf6925bb3729a644580ad4a9375d05883c62

Merge remote-tracking branch 'origin/libs/scrypt/local'
---

ec24cf6925bb3729a644580ad4a9375d05883c62