Fix previous merge.

Conflicts:

	src/drivers/Socket.py
	src/version.py
This commit is contained in:
Valentin Lorentz 2011-12-06 17:14:28 +01:00
parent d1bc7922ee
commit 332420bad9

View File

@ -1,3 +1,3 @@
"""stick the various versioning attributes in here, so we only have to change """stick the various versioning attributes in here, so we only have to change
them once.""" 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)'