Merge branch 'ant_build'
authorJanis Streib <janis@dogcraft.de>
Mon, 23 Jun 2014 21:34:46 +0000 (23:34 +0200)
committerJanis Streib <janis@dogcraft.de>
Mon, 23 Jun 2014 21:34:46 +0000 (23:34 +0200)

Trivial merge