Merge non-fast-forward for release branch merges

James Moger

2014-06-16 35bb2253c9ff0dcc44f3245026a141fde6415153

 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;
         }
      };
   }
}