Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Thu, 12 Dec 2013 15:08:26 +0000 (16:08 +0100)
committerAaron Kaplan <aaron@lo-res.org>
Thu, 12 Dec 2013 15:08:26 +0000 (16:08 +0100)
commit2275b1e939082a079cab92b47a34a8fe9326e60f
treeb7ddaa2502e7289b908bf0cfdf4f351fd83d7967
parent7d6e8ba5aecc5d4c81da419fe2377408998fcec7
parent2384f57e4944be9a315b5cd319f7682481ec8059
Merge branch 'master' of https://git.bettercrypto.org/ach-master

Conflicts:
src/security.bib
src/security.bib