Merge commit 'refs/merge-requests/88' of git://gitorious.org/f-droid/fdroidserver...

Conflicts:
	fdroidserver/build.py

diff --cc fdroidserver/build.py
index 718ad0792767ddda1a46b8487b30c315a8cb4f85,f46f6c7dce0bf1365920d04306f96d449e374bc6..755adc1ee0aae3492d668c83b2a4dfcac328b2a8
--- 1/fdroidserver/build.py
--- 2/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@@ -240,9 -240,9 +240,9 @@@ def build_local(app, thisbuild, vcs, bu
  
      if (version != thisbuild['version'] or
              vercode != thisbuild['vercode']):
-         raise BuildException(("Unexpected version/version code in output"
-                              "APK: %s / %s, "
-                              "Expected: %s / %s")
+         raise BuildException(("Unexpected version/version code in output;"
 -                             " APK: '%s' / '%s'"
++                             " APK: '%s' / '%s', "
+                              " Expected: '%s' / '%s'")
                               % (version, str(vercode), thisbuild['version'], str(thisbuild['vercode']))
                              )