Merge pull request #280 from dlobo/CRM-12117
authordlobo <lobo@civicrm.org>
Fri, 29 Mar 2013 14:57:27 +0000 (07:57 -0700)
committerdlobo <lobo@civicrm.org>
Fri, 29 Mar 2013 14:57:27 +0000 (07:57 -0700)
CRM-12117


Trivial merge