Merge branch 'master' of https://git.bettercrypto.org/ach-master
authorAaron Kaplan <aaron@lo-res.org>
Mon, 20 Oct 2014 20:29:36 +0000 (22:29 +0200)
committerAaron Kaplan <aaron@lo-res.org>
Mon, 20 Oct 2014 20:29:36 +0000 (22:29 +0200)
commitb6ab5e202b65a34f492261157d3406fb42bbfd6b
treed87d080856cf208bbb3242c06e3f3371cf90b31f
parentb9a5ffabff08381be4ee36e8ff66def20dc3ae17
parent66f8ce460c9ab06c32c78a6381a7a86489e809b6
Merge branch 'master' of https://git.bettercrypto.org/ach-master

Conflicts:
presentations/HACK.LU-2014/presentation/agenda.md
presentations/HACK.LU-2014/presentation/agenda.md