Merge branch 'master' of https://github.com/spesmilo/electrum
authorEagle[TM] <eagletm@mpex.net>
Sun, 6 Jan 2013 09:36:07 +0000 (10:36 +0100)
committerEagle[TM] <eagletm@mpex.net>
Sun, 6 Jan 2013 09:36:07 +0000 (10:36 +0100)
commit08ec5c442a27af1ca1ddee88b908ebdd4cb84bd9
treedfe668d7e091828896474db20d082ded074a8edd
parentaa6f84cecdd1d38ea037b2e6bccc45b2f3fbac2f
parent04322b7cc91b8fd213e2a1c5e1ab447edb32fa77
Merge branch 'master' of https://github.com/spesmilo/electrum