[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 27 Sep 2012 04:14:23 +0000 (09:44 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 27 Sep 2012 04:14:23 +0000 (09:44 +0530)
commit36452d42ce5be3cd7612aa9456ef016439471939
tree583c6cdff292504f8144228a0686d3f836b53141
parent2c6c7c82d31aa9ea79a5b33baea727b7083457a9
parent92ea964019a350fc1c2fac173bbc33aecee11bd3
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120927041423-4r2u9quuklma5yi1