OSDN Git Service

merged
authorbadlogic <contact@badlogicgames.com>
Sun, 3 Feb 2013 22:02:05 +0000 (23:02 +0100)
committerbadlogic <contact@badlogicgames.com>
Sun, 3 Feb 2013 22:02:05 +0000 (23:02 +0100)

Trivial merge