[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 20 Jul 2012 04:09:40 +0000 (09:39 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 20 Jul 2012 04:09:40 +0000 (09:39 +0530)
commit9789076a33fea1aa08970af8add5ae4dd8b0a837
tree1748b43371cad81d9235fdf4678b9260e9f2cbee
parentfb126b13b66e427570a912bfafb99e3b2ae4b035
parent7df568d138348aa00be74340d2c5d408dd239da6
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120718044007-42v3cb4gbg8u2ih8
bzr revid: mdi@tinyerp.com-20120719043853-djwgb256chgruhic
bzr revid: mdi@tinyerp.com-20120720040940-t5xnu21ef7rp2n0n