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, 5 insertions, 1 deletions

diff --git a/doc/sql_conventions.bb b/doc/sql_conventions.bb
index 2deb3cff6..f6a4e251f 100644
--- a/doc/sql_conventions.bb
+++ b/doc/sql_conventions.bb
@@ -56,7 +56,11 @@ $r = q("SELECT * FROM mail WHERE uid=%d AND $sql_extra ORDER BY created DESC LIM
 
 [b]NULL dates[/b]
 [li]To be written
-[code]Example[/code][/li]
+[code]// Example
+$r = q("DELETE FROM mail WHERE expires != '%s' AND expires < %s ",
+	dbesc(NULL_DATE),
+	db_utcnow()
+);[/code][/li]
 
 [b]Storing binary data[/b]
 [li]To be written