commit c61f16ba0d0af17e5d428d4c4a45c131db9247ff parent 2973f5d2c3ec7de9cc638886f5614c6494116d00 Author: Maran <maran.hidskes@gmail.com> Date: Sun, 10 Mar 2013 21:33:55 +0100 Merge branch 'feature/label_sync' of https://github.com/spesmilo/electrum into feature/label_sync