Merge branch 'master' into verbose-rewrite

diff --cc fdroidserver/checkupdates.py
Simple merge

diff --cc fdroidserver/common.py
index a41fa0a4a6aabeaf139ce7d3ce2fd56cc6265220,ee5a35133259b4fa880065fa39723313943e855d..3923054a5e55b9400dbfa587e9b060bd84f2294a
--- 1/fdroidserver/common.py
--- 2/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@@ -1344,11 -1342,8 +1355,11 @@@ def prepare_source(vcs, app, build, bui
          raise BuildException('Missing subdir ' + root_dir)
  
      # Initialise submodules if requred...
-     if build.get('submodules', 'no')  == 'yes':
+     if build.get('submodules', 'no') == 'yes':
          if verbose: print "Initialising submodules..."
 +    if build.get('submodules', 'no') == 'yes':
 +        if options.verbose:
 +            print "Initialising submodules..."
          vcs.initsubmodules()
  
      # Run an init command if one is required...