From: kpoppel <poulsen.kim@gmail.com>
Date: Fri, 5 Jul 2013 22:19:05 +0000 (+0200)
Subject: Merge branch 'indev' of https://github.com/RealBadAngel/technic into indev
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=ab38e29a18eb27814006f697040591c5438e701a;p=zefram%2Fminetest%2Ftechnic.git

Merge branch 'indev' of https://github.com/RealBadAngel/technic into indev
---

ab38e29a18eb27814006f697040591c5438e701a