Merge pull request #2404 from davecivicrm/CRM-14119
authorDave Greenberg <dave@civicrm.org>
Fri, 24 Jan 2014 01:05:06 +0000 (17:05 -0800)
committerDave Greenberg <dave@civicrm.org>
Fri, 24 Jan 2014 01:05:06 +0000 (17:05 -0800)
CRM-14119 This includes https://github.com/civicrm/civicrm-core/pull/240...


Trivial merge