# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1372684744 -3600
# Node ID 3fbd928acf60d92e90ec8fda106ed48e8210ea46
# Parent  b4ecdf12956ff606f77c70ab4ed11c17a37195b3# Parent  509a9dd1553cdf3079874f4db3cd753386bb37e3
Merge with stable

diff -r b4ecdf12956f -r 3fbd928acf60 tests/run-tests.py
--- a/tests/run-tests.py	Thu Jun 13 19:37:59 2013 +0100
+++ b/tests/run-tests.py	Mon Jul 01 14:19:04 2013 +0100
@@ -56,7 +56,6 @@
 import re
 import threading
 import killdaemons as killmod
-import cPickle as pickle
 import Queue as queue
 
 processlock = threading.Lock()