Merge pull request #6293 from JoeMurray/patch-1
authorTim Otten <totten@civicrm.org>
Fri, 14 Aug 2015 02:45:15 +0000 (19:45 -0700)
committerTim Otten <totten@civicrm.org>
Fri, 14 Aug 2015 02:45:15 +0000 (19:45 -0700)
fix for CRM-16896

1  2 
CRM/Utils/System.php

Simple merge