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)
commit35dabaefc39d4e0938a8fd78698f612059b2d839
tree39e3cc7f341b128651d7a7c0da2ead2533e7c761
parentb020debf5be9fca8be313bf48bec34e95420dd1c
parentc8f60166cd8b0e0e4e7fe741be70d2e55b3d11e2
Merge pull request #6293 from JoeMurray/patch-1

fix for CRM-16896
CRM/Utils/System.php