Merge branch 'pull/32'

* Merging pull request apenwarr#32.

Author: Hasimir

ui-macos/askpass.py

@@ -22,7 +22,7 @@ def askpass(prompt):
     rv = p.wait()
     if rv:
         return None
-    g = re.match("text returned:(.*), button returned:.*", out)
+    g = re.match("button returned:.*, text returned:(.*)", out)
     if not g:
         return None
     return g.group(1)