From 8a8e261076d4431e912daf9773b0bf9884a2b238 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sun, 21 Apr 2013 14:45:17 +0000
Subject: [PATCH]  - Legacy-Id: 5677

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

diff --git a/.gitignore b/.gitignore
index fbd9b09c5..ab68afcec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@
 /.project
 /.pydevproject
 /.settings
+/unix.tag
+/testresult
+/mergelog
+/mergequeue