Merge branch 'master' of gitorious.org:electrum/server
authorgenjix <fake@lol.u>
Wed, 21 Mar 2012 22:29:49 +0000 (22:29 +0000)
committergenjix <fake@lol.u>
Wed, 21 Mar 2012 22:29:49 +0000 (22:29 +0000)

Trivial merge