Merge pull request #7266 from jmcclelland/CRM-17586-master
authorcolemanw <coleman@civicrm.org>
Mon, 23 Nov 2015 16:03:51 +0000 (11:03 -0500)
committercolemanw <coleman@civicrm.org>
Mon, 23 Nov 2015 16:03:51 +0000 (11:03 -0500)
commit02d37a3e31df5ba1e24166c1136befc418254672
tree385898abe05d9d7373ae196789c32338761197eb
parent8405167dd7e3615c071c59dba329144b46f3fe3e
parent7a99327d5c4ba116c8626674e2dd6a5458d84df9
Merge pull request #7266 from jmcclelland/CRM-17586-master

Crm 17586 master