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

diff --git a/include/nav.php b/include/nav.php
index 1134d1b48..77287c021 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -124,7 +124,7 @@ EOT;
 
 	if($observer) {
 			$userinfo = array(
-			'icon' => $observer['xchan_photo_s'],
+			'icon' => $observer['xchan_photo_m'],
 			'name' => $observer['xchan_addr'],
 		);
 	}