Merge branch 'master' into feature/raw_tx
authorMaran <maran.hidskes@gmail.com>
Thu, 7 Mar 2013 16:24:44 +0000 (17:24 +0100)
committerMaran <maran.hidskes@gmail.com>
Thu, 7 Mar 2013 16:24:44 +0000 (17:24 +0100)

Trivial merge