Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-12-10-27-52
authorkurund <kurund@civicrm.org>
Tue, 12 Aug 2014 05:44:51 +0000 (11:14 +0530)
committerkurund <kurund@civicrm.org>
Tue, 12 Aug 2014 05:44:51 +0000 (11:14 +0530)
commit9d0857e01495c77accb2c7a2ee34ec4573261b24
tree0c4181bbe3ea24950d9fdd42866297a91b23bc83
parent0290a35cb6957bc7154b1c8121890fa61b8ba74e
parent74e39d34ff5f1bc4871754b0e4b8cddfdf03ccd1
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-12-10-27-52

Conflicts:
CRM/Member/Form/MembershipRenewal.php
CRM/Contact/BAO/ProximityQuery.php
CRM/Group/Page/AJAX.php
CRM/Member/Form/MembershipRenewal.php
xml/templates/civicrm_data.tpl