# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1380673331 -3600
# Node ID 115d2b6a8a9c62925751d8dca228b3c24eaef98e
# Parent  5a04f94e1da9d94bb22bdb39f31337b46554b4df# Parent  8e66ac9c0f0e8d72f633c862dba88dc547ac7e8e
Merge with stable

diff -r 5a04f94e1da9 -r 115d2b6a8a9c tests/run-tests.py
--- a/tests/run-tests.py	Tue Sep 24 03:12:59 2013 +0100
+++ b/tests/run-tests.py	Wed Oct 02 01:22:11 2013 +0100
@@ -341,6 +341,7 @@
     hgrc.write('[defaults]\n')
     hgrc.write('backout = -d "0 0"\n')
     hgrc.write('commit = -d "0 0"\n')
+    hgrc.write('shelve = --date "0 0"\n')
     hgrc.write('tag = -d "0 0"\n')
     if options.inotify:
         hgrc.write('[extensions]\n')