Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 17 insertions, 0 deletions

diff --git a/view/en/cron_bad_eml.tpl b/view/en/cron_bad_eml.tpl
new file mode 100644
index 000000000..ce30dae73
--- /dev/null
+++ b/view/en/cron_bad_eml.tpl
@@ -0,0 +1,17 @@
+This is the webserver at {{$sitename}};
+   
+A routine check indicates the scheduled maintenance tasks on this
+website are not running. Please review your "cron" jobs or the
+equivalent mechanism on your operating system and ensure these are
+running. Please review the INSTALL instructions if you are seeing
+this message for the first time. If these maintenance tasks have
+been running normally until now, please check to see if anything
+may have gone wrong to account for them not running currently. 
+This check is run approximately every three days. 
+
+The error message is '{{$error}}'.   
+
+The last successful execution was '{{$lastdate}}'. 
+
+Apologies for the inconvenience, 
+	your web server at {{$siteurl}}
\ No newline at end of file