Merge pull request #6353 from eileenmcnaughton/master
authorcolemanw <coleman@civicrm.org>
Thu, 30 Jul 2015 01:35:07 +0000 (21:35 -0400)
committercolemanw <coleman@civicrm.org>
Thu, 30 Jul 2015 01:35:07 +0000 (21:35 -0400)
Master


Trivial merge