Merge pull request #346 from dlobo/CRM-12298
authordlobo <lobo@civicrm.org>
Mon, 8 Apr 2013 23:25:24 +0000 (16:25 -0700)
committerdlobo <lobo@civicrm.org>
Mon, 8 Apr 2013 23:25:24 +0000 (16:25 -0700)
CRM-12298


Trivial merge