Merge branch 'verbose-rewrite' of gitorious.org:f-droid/fdroidserver into verbose...

Conflicts:
	fdroidserver/common.py

diff --cc fdroidserver/common.py
index 3923054a5e55b9400dbfa587e9b060bd84f2294a,ea7593edcba65827d3b2397ef9dacc71158d230b..07f0fbeb265638ccbbe83ec3f072d159278f95b7
--- 1/fdroidserver/common.py
--- 2/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@@ -1355,9 -1344,7 +1355,7 @@@ 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()