[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 5 Jul 2012 04:32:44 +0000 (10:02 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 5 Jul 2012 04:32:44 +0000 (10:02 +0530)
commite1b443993261fe5f7d6459d2f31ca45cc53a5a26
treeaf0a3cff1fc4ea8a4645396f504cdea88768b5c1
parent942f09e2847ec1aaf31ae5b7a993740deb089ae9
parent7caadaccccfb4f27fc4812806b19d3845b6810ad
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120705043244-rkvmlh3q2ho4eqrb