[MERGE] merged with trunk development branch
authorHarry (OpenERP) <hmo@tinyerp.com>
Thu, 20 Oct 2011 09:45:34 +0000 (15:15 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Thu, 20 Oct 2011 09:45:34 +0000 (15:15 +0530)
commit8d83ae361b25db107e80c65afe59b642b7fe8f8a
treef4628867228eb4912f394671ca012ce5d9235835
parent7225115a0f89aa3818b8139d878e8579497d2b35
parent2a30d5e185e55509058c056456618f83f2a97bdf
[MERGE] merged with trunk development branch

bzr revid: hmo@tinyerp.com-20111020094534-cs0c5jst6s692gej
addons/crm_profiling/__openerp__.py