[MERGE] 5.0.4-addons
authorChristophe Simonis <christophe@tinyerp.com>
Fri, 28 Aug 2009 16:43:12 +0000 (18:43 +0200)
committerChristophe Simonis <christophe@tinyerp.com>
Fri, 28 Aug 2009 16:43:12 +0000 (18:43 +0200)
bzr revid: christophe@tinyerp.com-20090828164312-x6j4etkj67b6txpi


Trivial merge