Merge branch 'feature/hex-interface' master
authorAzul <azul@riseup.net>
Sun, 14 Jul 2013 13:39:10 +0000 (15:39 +0200)
committerAzul <azul@riseup.net>
Sun, 14 Jul 2013 13:39:10 +0000 (15:39 +0200)
commitec05ed9a4cc4b4c0760ddf475e0bbb78ea407ce6
tree4dbb2edb86f03c39f0779191af709b27dfcd926a
parenta0adb2d7a12876df48b309e3949b2675b53b6634
parentcac0949c86209c7174bb5b4edc2f8eca65079429
Merge branch 'feature/hex-interface'