Merge pull request #2540 from eileenmcnaughton/CRM-14235
authorTim Otten <to-git@think.hm>
Thu, 20 Feb 2014 23:22:30 +0000 (15:22 -0800)
committerTim Otten <to-git@think.hm>
Thu, 20 Feb 2014 23:22:30 +0000 (15:22 -0800)
Crm 14235

1  2 
CRM/Utils/System/Joomla.php

Simple merge