[Checkins] SVN: transaction/trunk/ back to dev

[Chris McDonough]

Log message for revision 123585:
  back to dev

Changed:
  U   transaction/trunk/CHANGES.txt
  U   transaction/trunk/setup.py

-=-
Modified: transaction/trunk/CHANGES.txt
===================================================================
--- transaction/trunk/CHANGES.txt	2011-12-05 21:13:18 UTC (rev 123584)
+++ transaction/trunk/CHANGES.txt	2011-12-05 21:16:07 UTC (rev 123585)
@@ -1,9 +1,14 @@
 Changes
 =======
 
-1.2.0 (unreleased)
+1.2.1 (unreleased)
 ------------------
 
+- ...
+
+1.2.0 (2011-12-05)
+------------------
+
 New Features:
 
 - Python 3.2 compatibility.

Modified: transaction/trunk/setup.py
===================================================================
--- transaction/trunk/setup.py	2011-12-05 21:13:18 UTC (rev 123584)
+++ transaction/trunk/setup.py	2011-12-05 21:16:07 UTC (rev 123585)
@@ -12,7 +12,7 @@
 #
 ##############################################################################
 
-__version__ = '1.2.0dev'
+__version__ = '1.2.1dev'
 
 import os