[MERGE] merge trunk-social-tde branch.
authorBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Fri, 9 Mar 2012 11:39:45 +0000 (17:09 +0530)
committerBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Fri, 9 Mar 2012 11:39:45 +0000 (17:09 +0530)
commit8f8018fc9a6717077dbd7b19b321656da2865532
tree1ddae67d638ff5243bafedeb9c954fc4bc5837d1
parentd94bb35ff779ba730d7e9b5c457a871427ea9490
parent8a91a19813fc5126fe776dbf065a6ff8673b30a5
[MERGE] merge trunk-social-tde branch.

bzr revid: bth@tinyerp.com-20120309113945-gspwo230ou76n4yr