Update from upstream/master

Rafael Cavazin

2012-12-06 d4b95298902c8cea1411fc696ed80028b6091aa7

 src/com/gitblit/wicket/pages/RepositoriesPage.java

@@ -17,7 +17,6 @@


import java.io.File;

import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.InputStream;

import java.io.InputStreamReader;

import java.text.MessageFormat;

@@ -154,8 +153,7 @@
      }

      String message;

      try {         

         ContextRelativeResource res = WicketUtils.getResource(file);

         InputStream is = res.getResourceStream().getInputStream();

          InputStream is = GitBlit.self().getResourceAsStream(file);

         InputStreamReader reader = new InputStreamReader(is, Constants.CHARACTER_ENCODING);

         message = MarkdownUtils.transformMarkdown(reader);

         reader.close();