Merge pull request #426 from dlobo/CRM-12352
authordlobo <lobo@civicrm.org>
Mon, 15 Apr 2013 01:33:50 +0000 (18:33 -0700)
committerdlobo <lobo@civicrm.org>
Mon, 15 Apr 2013 01:33:50 +0000 (18:33 -0700)
CRM-12352


Trivial merge