[MERGE] merge with main addons
authorPurnendu Singh (OpenERP) <psi@tinyerp.com>
Wed, 18 Apr 2012 07:27:29 +0000 (12:57 +0530)
committerPurnendu Singh (OpenERP) <psi@tinyerp.com>
Wed, 18 Apr 2012 07:27:29 +0000 (12:57 +0530)
commit7a8e6e2b25b24a7b21d45aa3a289fcdf0c15bbe3
treef50983547e15e9bfa1509f8cdb9c5ab63a023679
parent1970f76ea0a1fd83723427bf89dad12692b17b22
parent79c1e97479535e794f3a298a625b6dd18f5544bd
[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120418072729-ykp9qrrugq18efzo