OSDN Git Service

Merge branch 'master' into maven
authorbadlogic <badlogicgames@gmail.com>
Thu, 23 May 2013 10:33:24 +0000 (12:33 +0200)
committerbadlogic <badlogicgames@gmail.com>
Thu, 23 May 2013 10:33:24 +0000 (12:33 +0200)

Trivial merge