projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b240c0 a3fab31)
Merge pull request #7630 from julialongtin/master
authorcolemanw <coleman@civicrm.org>
Fri, 22 Jan 2016 02:21:39 +0000 (21:21 -0500)
committercolemanw <coleman@civicrm.org>
Fri, 22 Jan 2016 02:21:39 +0000 (21:21 -0500)
Work around infinite memory consumption bug. CRM-17853


Trivial merge