Merge branch 'indev' of https://github.com/RealBadAngel/technic into indev
authorkpoppel <poulsen.kim@gmail.com>
Fri, 5 Jul 2013 22:19:05 +0000 (00:19 +0200)
committerkpoppel <poulsen.kim@gmail.com>
Fri, 5 Jul 2013 22:19:05 +0000 (00:19 +0200)

Trivial merge