Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Tue, 3 Jun 2014 17:06:36 +0000 (19:06 +0200)
committerAaron Kaplan <aaron@lo-res.org>
Tue, 3 Jun 2014 17:06:36 +0000 (19:06 +0200)
Conflicts:
presentations/M3AWWG/draft_m3aawg.pptx


Trivial merge