Merge pull request #7665 from julialongtin/safe_changes
authorcolemanw <coleman@civicrm.org>
Wed, 27 Jan 2016 02:10:39 +0000 (21:10 -0500)
committercolemanw <coleman@civicrm.org>
Wed, 27 Jan 2016 02:10:39 +0000 (21:10 -0500)
Safe changes


Trivial merge