Merge pull request #4930 from colemanw/CRM-15817
authorcolemanw <coleman@civicrm.org>
Wed, 14 Jan 2015 02:28:27 +0000 (21:28 -0500)
committercolemanw <coleman@civicrm.org>
Wed, 14 Jan 2015 02:28:27 +0000 (21:28 -0500)
CRM-15817 - Fix merge error


Trivial merge