OSDN Git Service

merge
authorbadlogic <contact@badlogicgames.com>
Mon, 8 Oct 2012 23:31:46 +0000 (01:31 +0200)
committerbadlogic <contact@badlogicgames.com>
Mon, 8 Oct 2012 23:31:46 +0000 (01:31 +0200)

Trivial merge