Merge branch 'master' of gitorious.org:electrum/server
authorThomasV <thomasv@gitorious>
Sun, 25 Mar 2012 03:49:06 +0000 (07:49 +0400)
committerThomasV <thomasv@gitorious>
Sun, 25 Mar 2012 03:49:06 +0000 (07:49 +0400)

Trivial merge