[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 26 Sep 2012 04:14:43 +0000 (09:44 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 26 Sep 2012 04:14:43 +0000 (09:44 +0530)
commitb2e4ad5931ee5ebca9952d7d8367eb0bbbbc42e2
treed60e0b05df7a3007e1defcbaa7a2ab19b0a4f661
parent96c82ce02127d7d56aac151081c613fc6bbf4e40
parent42ee1b52b1d83d99a1fdff6dc0bea777afbaf6cb
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120926041443-ajw8j90afywh44f8