Merge branch 'master' into develop

James Moger

2014-05-07 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287

 src/main/java/com/gitblit/transport/ssh/DisabledFilesystemFactory.java

@@ -36,6 +36,11 @@
         public SshFile getFile(String file) {
            return null;
         }

         @Override
         public FileSystemView getNormalizedView() {
            return null;
         }
      };
   }
}