Merge pull request #4752 from davecivicrm/CRM-15180
authorDave Greenberg <dave@civicrm.org>
Thu, 18 Dec 2014 23:35:10 +0000 (15:35 -0800)
committerDave Greenberg <dave@civicrm.org>
Thu, 18 Dec 2014 23:35:10 +0000 (15:35 -0800)
CRM-15180 - https://issues.civicrm.org/jira/browse/CRM-15180


Trivial merge