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)
commit3f7f97f090437a1ca9b21612998f8c9e9bd93e1a
tree305bad4cacddd709238f51912d63fc638410ba7f
parentb337fbc48943570f45e943494013898f65af7263
parent4db4a9e6a2992fce70e1d66967dc93d59459742c
Merge branch 'master' of https://git.bettercrypto.org/ach-master

Conflicts:
presentations/M3AWWG/draft_m3aawg.pptx
presentations/M3AWWG/draft_m3aawg.pdf
presentations/M3AWWG/draft_m3aawg.pptx
presentations/M3AWWG/drawing.graffle