[Merge] Merge with main server.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 26 Sep 2012 04:14:13 +0000 (09:44 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Wed, 26 Sep 2012 04:14:13 +0000 (09:44 +0530)
commitf17e83b9d9d55af3c68f6ee82d722d3318a31dab
treebfdc1fcb25d0b59baa964bd7a1cd855fc6e776b1
parent73cf5c56ac656c82b432b3a13543a8c7ccc2f2c4
parent3cc8c24ef41027d52f2293f98877c2e1834d3468
[Merge] Merge with main server.

bzr revid: mdi@tinyerp.com-20120925040414-r26j7vtmc3he0ddy
bzr revid: mdi@tinyerp.com-20120926041413-vm0qoqa9onaqiciz