Another annoying typo :(

Signed-off-by: Suki <suki@missallsunday.com>
Merge branch 'release-2.1' of git://github.com/SimpleMachines/SMF2.1.git into stuff
!Pass $do_defered as a parameter to integrate_pre_javascript_output hook

Signed-off-by: Suki <suki@missallsunday.com>
Add a check for only showing the "remove karma" checkbox if karma hasn't been removed yet.

Signed-off-by: Suki <suki@missallsunday.com>
Apply un_htmlspecialchars() when showing or edited the user's data on custom profile fields

Signed-off-by: Suki <suki@missallsunday.com>
Merge pull request #1763 from MissAllSunday/stuff

Stuff