merge with stable

This commit is contained in:
Georg Brandl 2013-12-10 10:29:47 +01:00
commit 3725570a16

View File

@ -1,3 +1,7 @@
Release 1.2.1 (in development)
==============================
Release 1.2 (released Dec 10, 2013)
===================================