Merge pull request #344 from dlobo/CRM-12300
authorcolemanw <coleman@civicrm.org>
Mon, 8 Apr 2013 21:53:36 +0000 (14:53 -0700)
committercolemanw <coleman@civicrm.org>
Mon, 8 Apr 2013 21:53:36 +0000 (14:53 -0700)
CRM-12300


Trivial merge