From 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66 Mon Sep 17 00:00:00 2001
From: Eddy Young <jeyoung@priscimon.com>
Date: Fri, 22 May 2015 03:47:09 -0400
Subject: [PATCH] Merge branch 'develop' into ticket-57_develop

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

diff --git a/.gitignore b/.gitignore
index 4cb4116..7405aa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /**/.idea
 /**/init.lua
 /**/session
+/nbproject/private

--
Gitblit v1.9.1