Merge branch 'master' of gitorious.org:electrum/server
authorgenjix <fake@lol.u>
Sun, 25 Mar 2012 18:01:11 +0000 (19:01 +0100)
committergenjix <fake@lol.u>
Sun, 25 Mar 2012 18:01:11 +0000 (19:01 +0100)
commit8f604575327622399f1439647ccd20ae8eacce70
treea8a731664ece2a80f6f63d35043a42ec245ad2c3
parent9825e7088e51b3f816149decd42510125026964a
parentf489bb2fe5072e45d397a739dbfc826314cd1477
Merge branch 'master' of gitorious.org:electrum/server