! merge mistake ... really :P
! merge mistake ... really :P

Signed-off-by: Spuds

StealthWombat/How-to-fork-an-Elk,joshuaadickerson/Elkarte2,interlab/Elkarte,emanuele45/Dialogo,nwsw/Elkarte,Ant59/Elkarte,nwsw/Elkarte,Spuds/Elkarte,nwsw/Elkarte,emanuele45/Dialogo,elkarte/Elkarte,elkarte/Elkarte,interlab/Elkarte,Spuds/Elkarte,emanuele45/Dialogo,Spuds/Elkarte,StealthWombat/How-to-fork-an-Elk,Ant59/Elkarte,wizardaf/Elkarte,StealthWombat/How-to-fork-an-Elk,wizardaf/Elkarte,joshuaadickerson/Elkarte2,wizardaf/Elkarte,joshuaadickerson/Elkarte2,Ant59/Elkarte,elkarte/Elkarte,interlab/Elkarte,StealthWombat/How-to-fork-an-Elk,joshuaadickerson/Elkarte2,wizardaf/Elkarte