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

---
 .gitignore |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index c4a25da..6c262bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,6 @@
 /*.sh
 /*.factorypath
 /src/main/dagger
-/src/main/java/.idea
+/**/.idea
+/**/init.lua
+/**/session

--
Gitblit v1.9.1