Merge branch 'master' of gitorious.org:electrum/server
authorThomasV <thomasv@gitorious>
Sat, 24 Mar 2012 21:25:41 +0000 (00:25 +0300)
committerThomasV <thomasv@gitorious>
Sat, 24 Mar 2012 21:25:41 +0000 (00:25 +0300)
commitcba62eeb2e5e1b653595b455bcd874e3c6368b5d
treed50d28406198ff4d805cf14d9ab283d75437e9f0
parent6433d8aa7fc16952d73da072071d804f70f73439
parent84ce3f841211f5a122524a4caf98687a1c21fe7e
Merge branch 'master' of gitorious.org:electrum/server