From e5b5b61d6ebab1e519db78f818fe7c2494c61681 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
Date: Sat, 12 Feb 2011 09:03:36 +0000
Subject: [PATCH] Merged r4813 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4814 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .gitignore | 2 ++
 .hgignore  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 853230d74..4288302f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+/.project
+/.loadpath
 /config/additional_environment.rb
 /config/database.yml
 /config/email.yml
diff --git a/.hgignore b/.hgignore
index cded71b38..e94d065e2 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,5 +1,7 @@
 syntax: glob
 
+.project
+.loadpath
 config/additional_environment.rb
 config/database.yml
 config/email.yml