[MERGE] merge trunk-social-tde branch.
authorBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Wed, 14 Mar 2012 05:41:38 +0000 (11:11 +0530)
committerBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Wed, 14 Mar 2012 05:41:38 +0000 (11:11 +0530)
commita0593335c4515542c0f0c99b9000f7aa6b27d66d
tree5848294ed396d1cf4909fcaff316729d7d739fa7
parentccf298b1ab1c5d731186b5dbe880a2dc0de392cb
parentc1e13fdff20f7946b584505f9e1041c6e2c154a0
[MERGE] merge trunk-social-tde branch.

bzr revid: bth@tinyerp.com-20120314054138-cw3an37w0f0clof8