Merge branch 'master' into tres

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

1 files changed, 2 insertions, 2 deletions

diff --git a/util/update_addon_repo b/util/update_addon_repo
index c6c2c4a47..42bd3a71f 100755
--- a/util/update_addon_repo
+++ b/util/update_addon_repo
@@ -25,7 +25,7 @@ for a in "${filelist[@]}" ; do
 #		echo 'ignoring git'
 		continue;
 	fi
-	if [ ! -d ../extend/theme/$1/$base ]; then
+	if [ ! -d ../extend/addon/$1/$base ]; then
 #		echo $a 'not a directory'
 		continue;
 	fi
@@ -35,5 +35,5 @@ for a in "${filelist[@]}" ; do
 	fi
 
 	echo linking $base 
-	ln -s ../extend/theme/$1/$base $base
+	ln -s ../extend/addon/$1/$base $base
 done