[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 23 Jul 2012 04:43:57 +0000 (10:13 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 23 Jul 2012 04:43:57 +0000 (10:13 +0530)
commit325454d14d9abd472a908c827abc0889604eafbe
tree70ffeed3e490f656a2ea61bcf4845b5773806f83
parenta7b71cca95750b8dc1d9ebd3a3caaca7c9527da5
parent61f361bfee1ae021aedef0ebbf3c91d15083cf1a
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120723044357-us4yw11mibx4uppy