[Merge] Merge with main server.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 21 Sep 2012 04:19:12 +0000 (09:49 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 21 Sep 2012 04:19:12 +0000 (09:49 +0530)
commita8e8c87d8d66d83daf677b8bc2824e812972dded
tree7e570b4bd7881e9e3595dabd147a1e59a01bbc1f
parentba4857238c07c105016f8de070c3e5f42aea94d6
parent649cf2e677736471ce45abbd20e1f9234051a9ca
[Merge] Merge with main server.

bzr revid: mdi@tinyerp.com-20120919042049-m90dfhji3h83nk2j
bzr revid: mdi@tinyerp.com-20120920040416-eaahw29q6j7g2m6j
bzr revid: mdi@tinyerp.com-20120921041912-vcm18tpgy2ie3e6i