From: Jan Schneider <jan@horde.org>
Date: Wed, 14 Jan 2009 18:26:04 +0000 (+0100)
Subject: Sync with hatchery.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c0dd72d4b3205a7c4f698caa36e516476522d546;p=horde.git

Sync with hatchery.
---

diff --git a/.gitignore b/.gitignore
index ee5eed87b..813a2b831 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,10 @@
 */config/*.php
+.DS_Store
+libs
 .cache
 .project
 .settings
-libs
+*~
+.#*
+*.orig
+*.rej