# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1360325511 0
# Node ID fa2a1c11ae4b33e3d9718ad3b7d2019a5a393f6a
# Parent  49ca5f6f1a9553503d0dece72edfac4f8b5a21be# Parent  02c4186c3aca9c3fbe4f629e51b0a093077545f4
Merge with stable

diff -r 49ca5f6f1a95 -r fa2a1c11ae4b tests/run-tests.py
--- a/tests/run-tests.py	Tue Jan 29 22:19:10 2013 +0000
+++ b/tests/run-tests.py	Fri Feb 08 12:11:51 2013 +0000
@@ -622,6 +622,7 @@
         script.append('set -x\n')
     if os.getenv('MSYSTEM'):
         script.append('alias pwd="pwd -W"\n')
+    n = 0
     for n, l in enumerate(t):
         if not l.endswith('\n'):
             l += '\n'