Merge branch 'master' of https://github.com/spesmilo/electrum
authorEagle[TM] <eagletm@mpex.net>
Sun, 6 Jan 2013 09:36:07 +0000 (10:36 +0100)
committerEagle[TM] <eagletm@mpex.net>
Sun, 6 Jan 2013 09:36:07 +0000 (10:36 +0100)

Trivial merge