Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

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

diff --combined data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
index 3323bea991b18afe242e9df5cb25961d62e4bdc5,58dc3034bca868439c34e40d336ab45cc3933a72..4afab42f1296bab6d02029c86d70215b3e616d8f
--- 1/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
--- 2/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
+++ b/data/font-nimbussansl.pk3dir/font-nimbussansl.cfg
@@@ -3,12 -3,12 +3,12 @@@ utf8_enable 
  r_font_hinting 1 // sorry, setting 2 (full autohinting) totally fails for unifont for now
  r_font_disable_freetype 0
  r_font_size_snapping 2
 -loadfont console fonts/unifont-5.1.20080907,gfx/conchars $con_textsize
 -loadfont notify fonts/n019004l.pfb,gfx/conchars $con_notifysize
 -loadfont chat fonts/n019004l.pfb,gfx/conchars $con_chatsize
 -loadfont centerprint fonts/unifont-5.1.20080907,gfx/conchars 9
 -loadfont infobar gfx/conchars 8
 -loadfont user0 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/conchars 9.6 12 12.8 16
 -loadfont user1 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/conchars 4 5 6 7 8 9 10 12 $hud_fontsize $scr_centersize // csqc font
 -loadfont user2 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/conchars 10 12 14 16 20 24 28 32 // csqc bigfont
 +loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize
 +loadfont notify fonts/n019004l.pfb,gfx/vera-sans $con_notifysize
 +loadfont chat fonts/n019004l.pfb,gfx/vera-sans $con_chatsize
 +loadfont centerprint fonts/unifont-5.1.20080907,gfx/vera-sans 9
 +loadfont infobar gfx/vera-sans 8
 +loadfont user0 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 9.6 12 12.8 16
 +loadfont user1 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 4 5 6 7 8 9 10 12 $sbar_fontsize $scr_centersize // csqc font
 +loadfont user2 fonts/n019004l.pfb,fonts/unifont-5.1.20080907,gfx/vera-sans 10 12 14 16 20 24 28 32 // csqc bigfont
- sbar_columns_set
+ scoreboard_columns_set