Merge branch 'release/v0.10' into development

2011-11-22 18:04:44 -04:00
parent 94490def2e 5fe495e967
commit d81a2ca574
1 changed files with 2 additions and 2 deletions
--- a/apps/main/init.py
+++ b/apps/main/init.py
@@ -20,8 +20,8 @@ admin_site = {'text': _(u'admin site'), 'view': 'admin:index', 'famfam': 'keyboa

 __version_info__ = {
    'major': 0,
-    'minor': 9,
-    'micro': 1,
+    'minor': 10,
+    'micro': 0,
    'releaselevel': 'final',
    'serial': 0
 }