From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0

---
 gitblit.iml |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gitblit.iml b/gitblit.iml
index 582127d..78828b6 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -102,13 +102,13 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="mail-1.4.3.jar">
+      <library name="javax.mail-1.5.1.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/ext/mail-1.4.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/javax.mail-1.5.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/ext/src/mail-1.4.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/ext/src/javax.mail-1.5.1.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -790,6 +790,17 @@
         </SOURCES>
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="tika-core-1.5.jar">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/ext/tika-core-1.5.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="jar://$MODULE_DIR$/ext/src/tika-core-1.5.jar!/" />
+        </SOURCES>
+      </library>
+    </orderEntry>
     <orderEntry type="module-library" scope="TEST">
       <library name="junit-4.11.jar">
         <CLASSES>

--
Gitblit v1.9.1