From 46e16d798e8cf362b6c874bab7562b8e7df23a58 Mon Sep 17 00:00:00 2001
From: Mika Suomalainen <mika.henrik.mainio@hotmail.com>
Date: Thu, 1 Sep 2011 19:00:39 +0300
Subject: [PATCH] Added merge.sh to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index fa633cca2..9939c273b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ docs/plugins
 *~
 *.mo
 push.sh
+merge.sh