[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 20 Nov 2012 05:22:05 +0000 (10:52 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Tue, 20 Nov 2012 05:22:05 +0000 (10:52 +0530)
commit9a70726925ffeac9cce4f431c6cd8ca53ecdb433
tree8345903659a614f1327c10ea6b4643a546e8af9d
parent975b794ade1bb64e9a36e2649a550a2657fe7c10
parentd9d127403b71d3fd401d3baf37b522b20ba89278
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20121120052205-itc2kbxnzix6w15p