[Merge] Merge with main server.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 1 Nov 2012 04:27:33 +0000 (09:57 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 1 Nov 2012 04:27:33 +0000 (09:57 +0530)
commit7af81dd79ac427b1afb2cc7110fc6de01ceed7b7
treecf10cab8f0573c17726f096ed8e7b32fc1d6a956
parent24f74d9d3a34d8bea88b9d3f037e48b851eeb0e2
parent7d1c5ac4ffad61b5954187a3091e332f3d975880
[Merge] Merge with main server.

bzr revid: mdi@tinyerp.com-20121101042733-1h2mai7d33oz2re3