From f7247c00503f1aae0a2b068b69df37da2ea302e3 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 26 Apr 2013 15:05:14 +0900
Subject: [PATCH] =?UTF-8?q?git=20subtree=20merge=EB=A5=BC=20=EC=9C=84?=
 =?UTF-8?q?=ED=95=9C=20ignore=EC=97=90=20g4s=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitignore b/.gitignore
index eeac49274..3d9189b36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 data
 dbconfig.php
 log
+g4s