Merge branch '1.1' into 1.2

Conflicts: docs/changelog.rst
vitek · Jan 12, 2012 · 3f305f4 · 3f305f4
2 parents c8912bb + 3edb315
commit 3f305f4
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -25,6 +25,8 @@ would have also been included in the 1.2 line.
 Changelog
 =========
 
+* :bug:`339` Don't list ``fabric.colors`` members in ``fab ---list``. Thanks to
+  Nick Trew for the report.
 * :release:`1.2.5 <2011-11-23>`
 * :release:`1.1.7 <2011-11-23>`
 * :bug:`441` Specifying a task module as a task on the command line no longer