Merge branch 'master' into sev/xolonium
authorSeverin Meyer <sev.ch@web.de>
Tue, 23 Dec 2014 19:48:00 +0000 (20:48 +0100)
committerSeverin Meyer <sev.ch@web.de>
Tue, 23 Dec 2014 19:48:00 +0000 (20:48 +0100)
commitbfdab051f22d11a553b69f28a294cb012b0b6c50
treeada2155caf87b24ab5c0bf567bc98f6189bbbe5d
parenta3525d441f182a4a2404dcaac985413cbfb0f51c
parent848e42482c861a65435257292595d4e5f0f74e63
Merge branch 'master' into sev/xolonium

Conflicts:
data/font-xolonium.pk3dir/font-xolonium.cfg
data/font-xolonium.pk3dir/font-xolonium.cfg