Merge branch 'master' of https://github.com/OpenBazaar/OpenBazaar-Server

Author: cpacia

config.py

@@ -12,7 +12,7 @@
 from ConfigParser import ConfigParser
 from urlparse import urlparse
 
-SERVER_VERSION = "0.2.3"
+SERVER_VERSION = "0.2.4"
 PROTOCOL_VERSION = 2
 CONFIG_FILE = join(os.getcwd(), 'ob.cfg')
 

openbazaard.py

@@ -219,7 +219,7 @@ class Parser(object):
         def __init__(self, daemon):
             self.daemon = daemon
             parser = argparse.ArgumentParser(
-                description='OpenBazaar-Server v0.2.3',
+                description='OpenBazaar-Server v0.2.4',
                 usage='''
     python openbazaard.py <command> [<args>]
     python openbazaard.py <command> --help