modified:   example.php
Merge branch 'master' of github.com:juji/php-SmtpEmail

Conflicts:
	example.php

	modified:   example.php