[MERGE] Merged trunk.
authorJiten (OpenERP) <jra@tinyerp.com>
Thu, 1 Nov 2012 08:24:31 +0000 (13:54 +0530)
committerJiten (OpenERP) <jra@tinyerp.com>
Thu, 1 Nov 2012 08:24:31 +0000 (13:54 +0530)
commit18627728d8ae443bc0b6d2c1a0f98ab9d32f8898
tree9df2b53233089d5639a6e94fc4b17662fad8a0b3
parent405b9d8cda5600531dcea4acd4abfd754eb9396b
parentb006809773df62a31663df260400c766b666c32a
[MERGE] Merged trunk.

bzr revid: jra@tinyerp.com-20121031051207-n6ndgu2bwpb10ino
bzr revid: jra@tinyerp.com-20121101082431-sal6tr5sk2w3ffyh