Merge branch 'master' into issues

James Moger

2012-01-13 0256e6aa26ebb51416d290d772897caf84a1cd82

 src/com/gitblit/FileSettings.java

@@ -20,7 +20,6 @@
import java.io.FileNotFoundException;

import java.util.Map;

import java.util.Properties;

import java.util.regex.Pattern;



import com.gitblit.utils.FileUtils;