Merge branch 'master' of https://github.com/kpoppel/technic
authorkpoppel <poulsen.kim@gmail.com>
Mon, 6 May 2013 18:55:33 +0000 (20:55 +0200)
committerkpoppel <poulsen.kim@gmail.com>
Mon, 6 May 2013 18:55:33 +0000 (20:55 +0200)

Trivial merge