Merge branch 'master' of gitorious.org:electrum/server
authorgenjix <fake@lol.u>
Wed, 21 Mar 2012 22:29:49 +0000 (22:29 +0000)
committergenjix <fake@lol.u>
Wed, 21 Mar 2012 22:29:49 +0000 (22:29 +0000)
commit671a9df69ba94717a4506e0804125d57ba705bf7
tree5c9879294e898482d14814fb4418d80e5c917ed9
parentc7afa218d4302644ce883b776b943762529664e3
parent6b21937da7b082a7ca5d571cae951535dc2d104d
Merge branch 'master' of gitorious.org:electrum/server