Merge commit 'refs/merge-requests/1' of git://gitorious.org/electrum/electrum into...

diff --cc server.py
index c22326a,8fce06c..b54797d
mode 100644,100755..100755
--- 1/server.py
--- 2/server.py
+++ b/server.py
@@@ -22,9 -22,9 +22,9 @@@ Todo
  """
  
  
 -import time, socket, operator, thread, ast, sys
 +import time, socket, operator, thread, ast, sys,re
  import psycopg2, binascii
- import bitcoinrpc
+ import bitcoin
  
  from Abe.abe import hash_to_address, decode_check_address
  from Abe.DataStore import DataStore as Datastore_class