[Merge] with : lp:~openerp-dev/openobject-server/trunk-v62_config
authorDBR (OpenERP) <dbr@tinyerp.com>
Fri, 27 Apr 2012 09:02:49 +0000 (14:32 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Fri, 27 Apr 2012 09:02:49 +0000 (14:32 +0530)
commite9f04c536c25beb1c9b6f34198be7d4cc7de5b88
tree1b04f9064ce16c118df8f4f29dfd918882d5c7db
parent40b34f176a9182cd85a9ded542fda4b6a3bedb1b
parent9b40320bae60d931049a9eb866b064fe7c374e81
[Merge] with : lp:~openerp-dev/openobject-server/trunk-v62_config

bzr revid: dbr@tinyerp.com-20120427090249-zbjfnokxo31lo2rm