Merge pull request #809 from dlobo/CRM-12667
authordlobo <lobo@civicrm.org>
Mon, 20 May 2013 18:08:38 +0000 (11:08 -0700)
committerdlobo <lobo@civicrm.org>
Mon, 20 May 2013 18:08:38 +0000 (11:08 -0700)
CRM-12667


Trivial merge