Merge remote-tracking branch 'dglopengl/master'
authorBergmann89 <bergmann89@muo-game.de>
Sun, 21 Sep 2014 16:38:48 +0000 (18:38 +0200)
committerBergmann89 <bergmann89@muo-game.de>
Sun, 21 Sep 2014 16:38:48 +0000 (18:38 +0200)

Trivial merge