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

diff --git a/util/update_addon_repo b/util/update_addon_repo
new file mode 100755
index 000000000..c6c2c4a47
--- /dev/null
+++ b/util/update_addon_repo
@@ -0,0 +1,39 @@
+#!/bin/sh -f
+
+if [ $# -ne 1 ]; then
+	echo usage: $0 repository
+	echo "Repositories:"
+	ls extend/addon
+	exit 1
+fi
+
+cd extend/addon/$1
+
+if [ -d .git ] ; then
+	git pull
+fi
+
+cd ../../..
+
+filelist=(`ls extend/addon/$1`)
+
+cd addon
+
+for a in "${filelist[@]}" ; do
+	base=`basename $a`
+	if [ $base = '.git' ]; then
+#		echo 'ignoring git'
+		continue;
+	fi
+	if [ ! -d ../extend/theme/$1/$base ]; then
+#		echo $a 'not a directory'
+		continue;
+	fi
+	if [ -x $base ]; then
+#		echo $base 'file exists'
+		continue;
+	fi
+
+	echo linking $base 
+	ln -s ../extend/theme/$1/$base $base
+done