Fix \n new line text break
typo

typo
Merge pull request #241 from rdymac/patch-14

Fixed typo in SimpleConfig comment
latest wikia version

latest wikia version
Merge pull request #242 from rdymac/patch-15

Update translations to the latest wikia version
Merge pull request #238 from rdymac/patch-11

Fix \n new line text break
Save contacts to the proper key in the wallet. fixes #234
Force updating the wallet after editing labels. fixes #223
Fix \n new line text break (2)

Fix \n new line text break
Merge pull request #243 from rdymac/patch-16

Fix \n new line text break (2)
Add icon back to Lite GUI. Fixes #112
Merge branch 'master' of https://github.com/spesmilo/electrum
Added support for Bitcoin URIs on OS X. Implements #209
Forgot to add plist for OS X build script
minor fixes to point of sale plugin
Merge branch 'master' into kivy