Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 01 Jul 2013 14:19:04 +0100
changeset 1277 3fbd928acf60
parent 1275 b4ecdf12956f (current diff)
parent 1276 509a9dd1553c (diff)
child 1288 2e9c41125820
Merge with stable
--- 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()