Merge pull request #946 from dlobo/CRM-12750
authorcolemanw <coleman@civicrm.org>
Mon, 3 Jun 2013 19:38:34 +0000 (12:38 -0700)
committercolemanw <coleman@civicrm.org>
Mon, 3 Jun 2013 19:38:34 +0000 (12:38 -0700)
CRM-12755


Trivial merge