! Previous fix for #1221 was horribly incomplete (fixes #1475 and #1484)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Missed a few things

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Clean up after ourselves

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1492 from Oldiesmann/release-2.1

! Previous fix for #1221 was horribly incomplete (fixes #1475 and #1484)
Add support for static and normal methods in smf_main()

Signed-off-by: Suki <suki@missallsunday.com>
Merge branch 'release-2.1' of git://github.com/SimpleMachines/SMF2.1.git into hooking_goodies