Merge pull request #7923 from PalanteJon/CRM-18165
authorcolemanw <coleman@civicrm.org>
Sat, 5 Mar 2016 02:20:06 +0000 (21:20 -0500)
committercolemanw <coleman@civicrm.org>
Sat, 5 Mar 2016 02:20:06 +0000 (21:20 -0500)
CRM-18165 - Fix display of activities when recurring activity is present


Trivial merge