Merge pull request #96 from BetterCrypto/revert-80-master
authorAaron Zauner <azet@azet.org>
Wed, 18 Feb 2015 18:34:40 +0000 (19:34 +0100)
committerAaron Zauner <azet@azet.org>
Wed, 18 Feb 2015 18:34:40 +0000 (19:34 +0100)
commit09e09012cb9a2c8006d0cb026454e5ac88455bde
tree9232017185d502cedc27761f8dde93070023baaa
parent1333f7a8bc6cff94109ccafbc8edfe7db5e21d04
parent044b5ad9923a31e38c2f5f4fcd496b3c2ef11a9e
Merge pull request #96 from BetterCrypto/revert-80-master

Revert "Adding prosody"