Merge release 1.6.0

James Moger

2014-06-16 111b48c40cd2cc4e19e28c8b6af8379885fb617b

 src/main/java/com/gitblit/GitBlitServer.java

@@ -198,7 +198,9 @@
            e.printStackTrace();
         } finally {
            try {
               is.close();
               if (is != null) {
                  is.close();
               }
            } catch (IOException e) {
               e.printStackTrace();
            }