format log
Merge branch 'master' of https://github.com/Bixie/printshop-cronjobs

Conflicts:
	cronjobs/cronjobs.php