Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-14-08-55-09
authorkurund <kurund@civicrm.org>
Thu, 14 May 2015 03:25:17 +0000 (08:55 +0530)
committerkurund <kurund@civicrm.org>
Thu, 14 May 2015 03:25:17 +0000 (08:55 +0530)
commitc81b71af66b39d1e8b08af83b404526e206c6a4a
tree7b6fbfd9bdb00c1bce3ca0e31bdff84eedb5ac50
parent1a68a782238cc06efa61aa7ebdb249586d1524f7
parenta35ed67905aa77fce0fa43ad68d4e103fb0de022
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-05-14-08-55-09
CRM/Member/Form/Membership.php
CRM/Member/Form/MembershipRenewal.php