Merge branch 'master' of gitorious.org:electrum/server
authorThomasV <thomasv@gitorious>
Sun, 25 Mar 2012 03:49:06 +0000 (07:49 +0400)
committerThomasV <thomasv@gitorious>
Sun, 25 Mar 2012 03:49:06 +0000 (07:49 +0400)
commit1beac3a3e55773cd4ceb3d284d02e5d036333668
tree6da1af8efc4fce2b4f80ff682f8344316df644ed
parentcba62eeb2e5e1b653595b455bcd874e3c6368b5d
parent22515839af33f8014d0f509a1bdce6abbaaa5c04
Merge branch 'master' of gitorious.org:electrum/server