Merge pull request #7312 from eileenmcnaughton/merge
authorcolemanw <coleman@civicrm.org>
Thu, 26 Nov 2015 15:10:33 +0000 (10:10 -0500)
committercolemanw <coleman@civicrm.org>
Thu, 26 Nov 2015 15:10:33 +0000 (10:10 -0500)
Merge 4.6 to master


Trivial merge