Merge branch 'master' of gitorious.org:electrum/electrum
authorthomasv <thomasv@gitorious>
Mon, 14 May 2012 11:35:47 +0000 (13:35 +0200)
committerthomasv <thomasv@gitorious>
Mon, 14 May 2012 11:35:47 +0000 (13:35 +0200)
commit796c9927024d96cda2d28c17cfa9828d2d71160b
treec5f162d473ceec4f5f175b497fae45c6533f627c
parentca31a9e37297242b1f5b7aa0c8b47a88be4f585c
parentff62a09832519403f9c00f993c48dc36d23d1200
Merge branch 'master' of gitorious.org:electrum/electrum