Squashed commit of the following:
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 13 Feb 2011 13:14:24 +0000 (14:14 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 13 Feb 2011 13:14:24 +0000 (14:14 +0100)
commite76676a61269f1bbeca5f183a207bf8ea7fc39a6
tree676ebf086854483d52102d13802190a5e179e0ee
parent7e05a76a4af6c503368eb997409a5af5717a7f70
Squashed commit of the following:

commit 9b5b44aae43b7da22de91ab7fb43c8dfb7745e76
Author: sev <sev.ch@web.de>
Date:   Sun Feb 13 00:40:19 2011 +0100

    Updated Xolonium font to version 1.2. Added Greek and a few more special characters

commit 8151eaeca4ebe86a0d8d2f8aa0e62cf2df00c59e
Merge: b4b3dc8 7e05a76
Author: sev <sev.ch@web.de>
Date:   Sun Feb 13 00:34:55 2011 +0100

    Merge branch 'master' of ssh://git.xonotic.org/xonotic into sev/fontupdate

commit b4b3dc83b8ba3588cc5c22b32c4099614757f9de
Merge: 51c2d90 2eb206c
Author: sev <sev.ch@web.de>
Date:   Thu Feb 10 12:16:40 2011 +0100

    Merge branch 'master' of ssh://git.xonotic.org/xonotic into sev/fontupdate

commit 51c2d9013d00f6badf279228a72a5fb47e343ddf
Merge: 664c428 465dee0
Author: sev <sev.ch@web.de>
Date:   Mon Jan 24 20:15:28 2011 +0100

    Merge branch 'master' of ssh://git.xonotic.org/xonotic into sev/fontupdate

commit 664c4281c5e6483b3107b64c4b12ef57daac8cda
Merge: cce7897 2d51977
Author: sev <sev.ch@web.de>
Date:   Thu Jan 20 11:06:27 2011 +0100

    Merge branch 'master' of ssh://git.xonotic.org/xonotic into sev/fontupdate

commit cce789708f515c84a0067de281f53e773b80e17a
Merge: 4642ac9 9e4a6e1
Author: sev <sev.ch@web.de>
Date:   Wed Jan 19 10:57:44 2011 +0100

    Merge branch 'master' of ssh://git.xonotic.org/xonotic into sev/fontupdate
data/font-xolonium.pk3dir/fonts/readme.txt
data/font-xolonium.pk3dir/fonts/xolonium.otf