OSDN Git Service

merged master
authorbadlogic <badlogicgames@gmail.com>
Sat, 13 Jul 2013 11:17:38 +0000 (13:17 +0200)
committerbadlogic <badlogicgames@gmail.com>
Sat, 13 Jul 2013 11:17:38 +0000 (13:17 +0200)

Trivial merge