Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
j2blake 2013-12-10 15:10:11 -05:00
commit 54c9d4e7b3

View file

@ -285,7 +285,7 @@ public class FreemarkerTemplateLoader implements TemplateLoader {
} }
public boolean fileQualifies(Path path) { public boolean fileQualifies(Path path) {
return Files.isReadable(path) && !Files.isDirectory(path); return !Files.isDirectory(path);
} }
public SortedSet<PathPieces> getMatches() { public SortedSet<PathPieces> getMatches() {