Merge "Only need one check for is_dir"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 12 Apr 2015 18:29:36 +0000 (18:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 12 Apr 2015 18:29:36 +0000 (18:29 +0000)
1  2 
includes/GlobalFunctions.php

Simple merge