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)
Conflicts:
presentations/HACK.LU-2014/presentation/agenda.md

1  2 
presentations/HACK.LU-2014/presentation/agenda.md