Merge pull request #4323 from davecivicrm/CRM-15234
authorDave Greenberg <dave@civicrm.org>
Tue, 7 Oct 2014 23:47:46 +0000 (16:47 -0700)
committerDave Greenberg <dave@civicrm.org>
Tue, 7 Oct 2014 23:47:46 +0000 (16:47 -0700)
Crm 15234


Trivial merge