Merge branch 'master' of gitorious.org:electrum/electrum
authorthomasv <thomasv@gitorious>
Thu, 19 Apr 2012 12:53:41 +0000 (14:53 +0200)
committerthomasv <thomasv@gitorious>
Thu, 19 Apr 2012 12:53:41 +0000 (14:53 +0200)
commit2df4d6de5ac089485c2aae7c198348e9f4208154
tree25b69b97237539ee9b1d7f1425fc4709023c79eb
parent6f2e9feb43c7d4db887444b1ab8a770f4511bf5a
parent46a51526e7cdfd38c38dc7e8f35a47ffae946d0d
Merge branch 'master' of gitorious.org:electrum/electrum