[MRG] merge with main addons
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 25 Apr 2012 06:12:15 +0000 (11:42 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Wed, 25 Apr 2012 06:12:15 +0000 (11:42 +0530)
commit85ae5bf10c6186e626394f24ef2aecdc26a3747a
treeed981c33b25e7563bc96904b600f3e8f0c86c593
parent2178b49425b0bbffbf40008dd1594f5725ac91f3
parente9f015e217f1ff48d95e9b55a9515b7276240c48
[MRG] merge with main addons

bzr revid: tpa@tinyerp.com-20120425061215-33q2i5l1zv2z6r7l