From: sebix <szebi@gmx.at>
Date: Sat, 11 Jan 2014 20:24:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.bettercrypto.org/ach-master.git/commitdiff_plain/8d6dfe910ff0403afb73a71b09cfaa1cdffde511

Merge remote-tracking branch 'upstream/master'
---

8d6dfe910ff0403afb73a71b09cfaa1cdffde511