From bc388e02ab889dcfe48df6db994df45164ea1ac6 Mon Sep 17 00:00:00 2001
From: Julio Cesar Laura <juliocesar@colosa.com>
Date: Thu, 14 Aug 2014 15:21:59 -0400
Subject: [PATCH] Merge code from github to bitbucket 2014-08-14 15:23

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 976524a46..b951fad8a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -36,4 +36,3 @@ workflow/public_html/build-log.html
 temp.txt
 update.sh
 workflow/public_html/translations/
-