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)

Trivial merge