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)

Trivial merge