Merge branch 'master' into 1.9 - electrum

commit 075a1d13c518a3ca047ba062f38f31f8bb44a786
parent afac84e231c424dbf2dc9588196114aec37f3f82
Author: thomasv <thomasv@gitorious>
Date:   Wed,  4 Sep 2013 17:11:41 +0200

Merge branch 'master' into 1.9

	electrum Electrum Bitcoin wallet
	git clone https://git.parazyd.org/electrum
	Log \| Files \| Refs \| Submodules