From: pk910 <philipp@zoelle1.de>
Date: Mon, 12 Aug 2013 20:47:10 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.pk910.de:16110/ZNCAdmin
X-Git-Url: http://git.pk910.de/?p=ZNCAdmin.git;a=commitdiff_plain;h=fbde9a30ca3827c5089dc6a64c99028d7065581e;hp=fceb02a206272b75084ca5190c4d3d4fbb497826

Merge branch 'master' of ssh://git.pk910.de:16110/ZNCAdmin
---

diff --git a/.gitignore b/.gitignore
index 3b725d3..2e48780 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 config.inc.php
-.project
\ No newline at end of file
+.project
+.settings/org.eclipse.php.core.prefs
\ No newline at end of file