From 332420bad953fcb64b487618bf3c402546f6207c Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 6 Dec 2011 17:14:28 +0100 Subject: [PATCH] Fix previous merge. Conflicts: src/drivers/Socket.py src/version.py --- src/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.py b/src/version.py index ebd088ae6..afa15a54f 100644 --- a/src/version.py +++ b/src/version.py @@ -1,3 +1,3 @@ """stick the various versioning attributes in here, so we only have to change them once.""" -version = '0.83.4.1+limnoria (2011-12-03T12:45:07+0100)' +version = '0.83.4.1+limnoria (2011-12-06T17:14:28+0100)'