Merge branch 'master' of gitorious.org:electrum/electrum
authorAmir Taaki <genjix@riseup.net>
Wed, 27 Jun 2012 20:18:07 +0000 (22:18 +0200)
committerAmir Taaki <genjix@riseup.net>
Wed, 27 Jun 2012 20:18:07 +0000 (22:18 +0200)
commitecc11035ecce02c11daf8d79a1d071f49f43df3e
tree9766606c60b4c3e20f3d5071c7376deae0649a7f
parent820985dd68e935af353eeabd13b6b34fc7a6e694
parent8288279fc3f239a65b150ce19151729a50a9f6c8
Merge branch 'master' of gitorious.org:electrum/electrum