Merge branch 'feature/label_sync' of https://github.com/spesmilo/electrum into featur...
authorMaran <maran.hidskes@gmail.com>
Sun, 10 Mar 2013 20:33:55 +0000 (21:33 +0100)
committerMaran <maran.hidskes@gmail.com>
Sun, 10 Mar 2013 20:33:55 +0000 (21:33 +0100)

Trivial merge