From: Mirio <opivy@hotmail.de>
Date: Sun, 23 Aug 2015 14:17:17 +0000 (+0000)
Subject: Merge branch 'Mirio/helpsystem' into 'master'
X-Git-Tag: xonotic-v0.8.1~2
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;ds=sidebyside;h=f65146807001723f91048021d1616178d90fc86d;hp=-c;p=xonotic%2Fxonotic.git

Merge branch 'Mirio/helpsystem' into 'master'

Mirio/helpsystem

Fixing the first message, the nick color, add some colors to highlight words.

See merge request !13
---

f65146807001723f91048021d1616178d90fc86d