Merge pull request #240 from dlobo/CRM-12205
authordlobo <lobo@civicrm.org>
Mon, 25 Mar 2013 02:58:14 +0000 (19:58 -0700)
committerdlobo <lobo@civicrm.org>
Mon, 25 Mar 2013 02:58:14 +0000 (19:58 -0700)
CRM-12205


Trivial merge