Merge branch '1.0' into 1.1

Conflicts: docs/changelog.rst
fabric · Jul 8, 2011 · a442ed6 · a442ed6
2 parents 67cd6cc + 54b1c5b
commit a442ed6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -27,7 +27,7 @@ Changelog
 
 * :support:`382` Experimental overhaul of changelog formatting & process to make supporting multiple lines of development less of a hassle.
 * :release:`1.1.2 <2011-07-07>` (see below for details)
-* :release:`1.0.2 <2011-06-24>`
+* :release:`1.0.2 <2011-06-24>` (see below for details)
 
 
 Prehistory