Merge remote-tracking branch 'origin/Mario/hook_color'
authorRudolf Polzer <divverent@xonotic.org>
Thu, 8 May 2014 17:08:12 +0000 (19:08 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 8 May 2014 17:08:12 +0000 (19:08 +0200)
* origin/Mario/hook_color:
  Player colored hooks, also show hook coming from player in 3rd person mode


Trivial merge