Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-28-14-52-15
authorkurund <kurund@civicrm.org>
Mon, 28 Oct 2013 09:24:25 +0000 (14:54 +0530)
committerkurund <kurund@civicrm.org>
Mon, 28 Oct 2013 09:24:25 +0000 (14:54 +0530)
commit52df19870805bf5a2bae2388a1f6c5a0309c2d92
tree7bb35efd2cf468197a413a670f7f3a8e212c8963
parentda278ddd456e131974563998c43ecd80da3efc0f
parent3091c9861d538d2cad07135bccd8a20c2a1e503f
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-28-14-52-15

Conflicts:
templates/CRM/common/SocialNetwork.tpl
templates/CRM/common/SocialNetwork.tpl