Merge commit 'refs/merge-requests/11' of gitorious.org:electrum/electrum into cobleeb...
authorMaran <maran.hidskes@gmail.com>
Mon, 23 Jul 2012 18:50:39 +0000 (20:50 +0200)
committerMaran <maran.hidskes@gmail.com>
Mon, 23 Jul 2012 18:50:39 +0000 (20:50 +0200)
commitd9c8a2472c988f288e8b07e1c45c5b3663f741c1
treeb6cfa600858d3a550256bb88cac643359dc39efe
parent56b85914cf1e7357de824fcbef0a4de702560a47
parent640e0346e042458bac9e1c7308de62c3bba3c1b9
Merge commit 'refs/merge-requests/11' of gitorious.org:electrum/electrum into cobleebuilder