Marcus Bointon 86d2b069d8 Merge branch 'master' into 6.0 ... # Conflicts: # changelog.md # test/phpmailerTest.php		2016-05-09 11:34:42 +02:00
..
bootstrap.php	Remove obsolete QP-encode function	2016-05-02 18:27:44 +02:00
fakepopserver.sh	Years & version numbers	2016-04-07 11:04:03 +02:00
fakesendmail.sh	More secure temp folder selection in fakesendmail	2013-05-10 03:18:16 +02:00
phpmailerLangTest.php	Years & version numbers	2016-04-07 11:04:03 +02:00
phpmailerTest.php	Merge branch 'master' into 6.0	2016-05-09 11:34:42 +02:00
runfakepopserver.sh	See what's happening in the shell	2015-11-24 19:04:12 +01:00
testbootstrap-dist.php	Tidy up copyright notices	2015-11-10 14:44:16 +01:00