Merge branch 'master' into tres and add some work on the item_deleted flag refactor

Conflicts:
	include/attach.php
	include/onedirsync.php
	include/zot.php
	mod/locs.php

1 files changed, 7 insertions, 0 deletions

diff --git a/mod/xpoco.php b/mod/xpoco.php
new file mode 100644
index 000000000..560966750
--- /dev/null
+++ b/mod/xpoco.php
@@ -0,0 +1,7 @@
+<?php
+
+require_once('include/socgraph.php');
+
+function xpoco_init(&$a) {
+	poco($a,true);
+}