[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Thu, 20 Oct 2011 09:47:28 +0000 (15:17 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Thu, 20 Oct 2011 09:47:28 +0000 (15:17 +0530)
commit8439c41b4aeb34ec33fb6e70af65f92f3ef62a7b
tree13829692365f38d47a200b8404547f6a5b91282a
parent8d83ae361b25db107e80c65afe59b642b7fe8f8a
parentb60162dc0cf1e13f3df69ccbab1097771a63b0c8
[MERGE]

bzr revid: hmo@tinyerp.com-20111020094728-cggyscrr4hjq5bvm
addons/crm_profiling/__openerp__.py