From: NathanSweet <nathan.sweet@gmail.com>
Date: Tue, 28 May 2013 20:34:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=faaad672361fc9116add069aa9f8b6f4e4466f2d;p=mikumikustudio%2Flibgdx-mikumikustudio.git

Merge remote-tracking branch 'origin/master'
---

faaad672361fc9116add069aa9f8b6f4e4466f2d