Merge branch 'release/0.6' into stable

anisse · Oct 3, 2011 · a30ef71 · a30ef71
2 parents ed4a6cd + e0e4fae
commit a30ef71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,4 @@
-0.6 (unreleased)
+0.6 (2011-10-03)
     - The Django 1.3 staticfiles contrib app is now supported.
     - Bundles may now contain URLs (as supported by urllib2).
     - Support for recursive globbing using the python-glob2 package.

diff --git a/src/webassets/__init__.py b/src/webassets/__init__.py
@@ -1,4 +1,4 @@
-__version__ = (0, 6, 'dev')
+__version__ = (0, 6)
 
 
 # Make a couple frequently used things available right here.