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)
commit474d975d1373a7363bba8ef50275db7a9b684f6d
tree21234d5a27f9a5060055bccdc91bb9d8c5595b85
parent2b240c0c8fd9f7d69ffc62dfb89dbb2ba2ccb742
parenta3fab31fe25af28949e9b80b034a75bcdd271083
Merge pull request #7630 from julialongtin/master

Work around infinite memory consumption bug. CRM-17853