projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b49385 7427adc)
Merge branch '4.6' into master
authorColeman Watts <coleman@civicrm.org>
Tue, 11 Aug 2015 17:16:51 +0000 (13:16 -0400)
committerColeman Watts <coleman@civicrm.org>
Tue, 11 Aug 2015 17:16:51 +0000 (13:16 -0400)
Conflicts:
CRM/Member/Form/Membership.php


Trivial merge