[MERGE] Merged the changelog upto 5.0.10

bzr revid: jvo@tinyerp.com-20100511143954-exhrzxidou2r3j2a
johnfelipe · May 11, 2010 · 0c9ecbf · 0c9ecbf
1 parent 505b63f
commit 0c9ecbf
Show file tree

Hide file tree

Showing 3 changed files with 914 additions and 160 deletions.
diff --git a/bin/release.py b/bin/release.py
@@ -21,8 +21,8 @@
 ##############################################################################
 
 name = 'openerp-server'
-version = '5.2dev'
-major_version = '5.2'
+version = '6.0dev'
+major_version = '6.0'
 description = 'OpenERP Server'
 long_desc = '''\
 OpenERP is a complete ERP and CRM. The main features are accounting (analytic