Merge pull request #675 from dlobo/CRM-12558
authordlobo <lobo@civicrm.org>
Tue, 7 May 2013 23:39:11 +0000 (16:39 -0700)
committerdlobo <lobo@civicrm.org>
Tue, 7 May 2013 23:39:11 +0000 (16:39 -0700)
CRM-12558


Trivial merge