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

diff --git a/mod/import.php b/mod/import.php
index bd95311df..030b714bc 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -248,7 +248,7 @@ function import_post(&$a) {
 
 	if($seize) {
 
-		// replace our existing xchan if we're seizing control
+		// replace any existing xchan we may have on this site if we're seizing control
 
 		$r = q("delete from xchan where xchan_hash = '%s'",
 			dbesc($channel['channel_hash'])