Merge pull request #3296 from davecivicrm/CRM-12882
authorDave Greenberg <dave@civicrm.org>
Mon, 19 May 2014 17:59:09 +0000 (10:59 -0700)
committerDave Greenberg <dave@civicrm.org>
Mon, 19 May 2014 17:59:09 +0000 (10:59 -0700)
Crm 12882


Trivial merge