Merge branch 'master' of gitorious.org:f-droid/fdroidserver

diff --cc fdroidserver/checkupdates.py
index 282471b00e635f51bb802afbaf60fdaf6c795f99,7db89ff4a438fcf90fc27330e9fb93df86824e0f..65f5b5d8463f7ccaa1217596203681da87567321
--- 1/fdroidserver/checkupdates.py
--- 2/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@@ -177,13 -176,8 +176,10 @@@ def check_market(app)
      except urllib2.HTTPError, e:
          if e.code == 404:
              return (None, 'Not in market')
-         elif e.code == 503:
-             print "Whoops"
-             sys.exit(1)
          else:
              return (None, 'Failed with HTTP status' + str(req.getcode()))
 +    except Exception, e:
 +        return (None, 'Failed:' + str(e))
      page = resp.read()
  
      version = None

diff --cc fdroidserver/common.py
Simple merge