TortoiseGitMerge: Handle utf-16 files that don't have a BOM

Also update TortoiseGitBlame which relies on the enum defined in TortoiseGitMerge

Based on TortoiseSVN revision 24555

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Allow to configure and use mail relay server

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Some further cleanup

Signed-off-by: Sven Strickroth <email@cs-ware.de>
SMTPS
last step: make nice and do some more cleanup
hacked tls
make plain, tls and ssl work
Do some cleanup
Fixed a warning
weiergehts
senddirect
jop
fast