Merge branch 'master' of git://github.com/civicrm/civicrm-core into fix-membership...
authorEffy Elden <git@effy.is>
Sun, 22 May 2016 07:01:56 +0000 (03:01 -0400)
committerEffy Elden <git@effy.is>
Sun, 22 May 2016 07:01:56 +0000 (03:01 -0400)
commitead6bbf9323c0d328085d1e9449394253bef6130
tree3af291ccd999477ba1f2b028f3a2f572235c0c79
parent82a51e0a75946fcf7c2a0021a6d7fa8b2334ff63
parent4fd7786d42d7798a3805834c207fead58c0ac6b1
Merge branch 'master' of git://github.com/civicrm/civicrm-core into fix-membership-id-in-search-builder