Merge remote-tracking branch 'origin/nifrek/playermodels_sources'
authormerlijn <mhofstra@gmail.com>
Sat, 7 Jan 2012 10:55:39 +0000 (11:55 +0100)
committermerlijn <mhofstra@gmail.com>
Sat, 7 Jan 2012 10:55:39 +0000 (11:55 +0100)

Trivial merge