Merge branch 'master' of gitorious.org:electrum/server
authorThomasV <thomasv@gitorious>
Sat, 24 Mar 2012 21:20:25 +0000 (00:20 +0300)
committerThomasV <thomasv@gitorious>
Sat, 24 Mar 2012 21:20:25 +0000 (00:20 +0300)
commit6433d8aa7fc16952d73da072071d804f70f73439
treea47f1f51ae7e9ac505f045a8a72c59bd0ea4ace3
parentf7279c71bf2914cbc233df5a9f0a8b627845d6d3
parent5c89878db307ef2c0687a801751eeec2997d6db6
Merge branch 'master' of gitorious.org:electrum/server