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)
commit787f988595ffd7ff1f3e810f5c0598061cc561e3
tree084fb860ef5df914b29431b515e1436de0f3a554
parent3b49385c20114fac86e200e28224bc7c1999e8d5
parent7427adcfba896b4589f852c45dead542443cd4a0
Merge branch '4.6' into master

Conflicts:
CRM/Member/Form/Membership.php