Merge branch 'master' into feature/raw_tx
authorMaran <maran.hidskes@gmail.com>
Sun, 10 Mar 2013 20:23:24 +0000 (21:23 +0100)
committerMaran <maran.hidskes@gmail.com>
Sun, 10 Mar 2013 20:23:24 +0000 (21:23 +0100)

Trivial merge