[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 5 Jul 2012 04:30:05 +0000 (10:00 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 5 Jul 2012 04:30:05 +0000 (10:00 +0530)
commit415a7282cf80e41af9efbd6c3dbed71afd24a98f
treebea06da5895c77c7602e95574d589ae094d162a8
parenteed5e64c10e48290045d367f7846c93a1052048f
parent7caadaccccfb4f27fc4812806b19d3845b6810ad
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120705043005-hh3teh5role8mwtr