[MERGE]:with main addons
authorPinakin Nayi (OpenERP) <pna@tinyerp.com>
Fri, 21 Sep 2012 06:59:10 +0000 (12:29 +0530)
committerPinakin Nayi (OpenERP) <pna@tinyerp.com>
Fri, 21 Sep 2012 06:59:10 +0000 (12:29 +0530)
commit5b2daac724ec26c9a33116fb959ee95b359ff7e8
tree886659a4b87f9a2160d7f9188459e813335de3a5
parent819455b73cbc336142579c788445b4d4734bd83f
parentfa9b5c7dc3a88d6d2b195ad0a6c71f527271daa6
[MERGE]:with main addons

bzr revid: pna@tinyerp.com-20120921065910-wl7unh0mur1g8z56