Merge pull request #683 from dlobo/CRM-12558
authordlobo <lobo@civicrm.org>
Wed, 8 May 2013 14:09:08 +0000 (07:09 -0700)
committerdlobo <lobo@civicrm.org>
Wed, 8 May 2013 14:09:08 +0000 (07:09 -0700)
CRM-12558


Trivial merge