From ebc1f691b9d09c757de881c2028c10a261c23b8a Mon Sep 17 00:00:00 2001
From: AlGreed <thegreedyplanetz@gmail.com>
Date: Fri, 4 Nov 2016 03:05:37 +0100
Subject: [PATCH] Merge remote-tracking branch 'drwetter/2.9dev' into 2.9dev

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index adad0cf..cf8dc88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 .DS_Store
 tmp.json
 *.bak
+
+*.xml
+
+*.iml