From 5ad1b8db0837e384276ad274af51c959b6f9ce64 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sat, 20 Apr 2013 05:42:08 +0200
Subject: [PATCH] Merge branch 'indev' of git://github.com/RealBadAngel/technic into indev

---
 technic/rubber.lua |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/technic/technic/rubber.lua b/technic/rubber.lua
similarity index 100%
rename from technic/technic/rubber.lua
rename to technic/rubber.lua

--
Gitblit v1.8.0