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, 11 insertions, 0 deletions

diff --git a/util/shredder/readme b/util/shredder/readme
new file mode 100644
index 000000000..44ed6f45c
--- /dev/null
+++ b/util/shredder/readme
@@ -0,0 +1,11 @@
+http://kmkeen.com/jshon/
+
+
+
+Jshon was made to be part of the usual text processing pipeline. However, every single -u is printed out to its own line. Most shell tools expect fields to be tab separated, and newlines between sets of fields. The paste tool does this. However, paste breaks down on blank lines so use sed to pad out the empty lines.
+
+jshon ... | sed 's/^$/-/' |  paste -s -d "\t\t\n" | ....
+
+The arguments need a little explaining.
+-s is mysteriously needed for paste to correctly handle input.
+-d is less obvious from the manpage, because it can take multiple characters which are looped through. The above example concatenates every three lines together.