[Merge] Merge with main server.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 26 Nov 2012 04:47:56 +0000 (10:17 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Mon, 26 Nov 2012 04:47:56 +0000 (10:17 +0530)
commitb049de2bec5fe6bac2aa97f4c33cb0eb66f81cf8
tree76aef1b811feeaf52e3c6b7e40208484898d1ff5
parentdee3985c824ad5ecbb61e02847971403c84070b7
parent54ada979878dc827f6bc99f2f10e54d20c0d422f
[Merge] Merge with main server.

bzr revid: mdi@tinyerp.com-20121122043710-9e002b2o0oc7semk
bzr revid: mdi@tinyerp.com-20121123044245-djsn1r0i031sosu0
bzr revid: mdi@tinyerp.com-20121126044756-nisc5ofd1gp2ggpu