Merge remote-tracking branch 'glBitmap/unstable'
authorBergmann89 <bergmann89@muo-game.de>
Sun, 21 Sep 2014 15:37:18 +0000 (17:37 +0200)
committerBergmann89 <bergmann89@muo-game.de>
Sun, 21 Sep 2014 15:37:18 +0000 (17:37 +0200)

Trivial merge