# HG changeset patch
# User veltr
# Date 1357319530 -3600
# Node ID 5395d9566c622595cea66c5a77535cdc018f4cc6
# Parent  458cc4576415f11532830e1b49344eb8ee11b8ec# Parent  15cede67f60cfcebc3cfe3804839b2d4df3e5638
Merging...

diff -r 458cc4576415 -r 5395d9566c62 .hgtags
--- a/.hgtags	Fri Jan 04 18:10:03 2013 +0100
+++ b/.hgtags	Fri Jan 04 18:12:10 2013 +0100
@@ -6,3 +6,4 @@
 92f16c04e4e701f4f34379b0d0bb7a5393098be6 V01.11
 92f16c04e4e701f4f34379b0d0bb7a5393098be6 V01.11
 00632d0dee47b4ffa5506009810197a9eb2d47ad V01.11
+b1c1ffd394a6e61d01ec3452f0473eaccefb3dba V01.12
diff -r 458cc4576415 -r 5395d9566c62 src/theend/__init__.py
--- a/src/theend/__init__.py	Fri Jan 04 18:10:03 2013 +0100
+++ b/src/theend/__init__.py	Fri Jan 04 18:12:10 2013 +0100
@@ -1,4 +1,4 @@
-VERSION = (1, 11, 0, "final", 0)
+VERSION = (1, 12, 0, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r 458cc4576415 -r 5395d9566c62 virtualenv/res/src/ldt.tar.gz
Binary file virtualenv/res/src/ldt.tar.gz has changed