[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 9 Oct 2012 04:24:37 +0000 (09:54 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 9 Oct 2012 04:24:37 +0000 (09:54 +0530)
commit358ec496b354bfc73df00fdfb3377033bfec57e3
tree98565491037708046a339d47eb4c1d882aedb5b3
parentdb7926bc703a6c0e884d3cd2477bf40161ac0b9a
parentcf35464125f0625100bd52111268534c116f3873
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20121004043626-iz0iljrlw3my6sl0
bzr revid: mdi@tinyerp.com-20121005044511-7t3q0evbrsb4wisl
bzr revid: mdi@tinyerp.com-20121008044631-oileagz2xh08t4vg
bzr revid: mdi@tinyerp.com-20121009042437-frzoor6zql1yvkg4