Merge remote-tracking branch 'alexis/game_framework'
authorJean Privat <jean@pryen.org>
Thu, 14 Nov 2013 12:02:26 +0000 (07:02 -0500)
committerJean Privat <jean@pryen.org>
Thu, 14 Nov 2013 12:02:26 +0000 (07:02 -0500)

Trivial merge