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

diff --git a/include/photos.php b/include/photos.php
index 29e2f32e2..badf7cb10 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -222,7 +222,6 @@ function photo_upload($channel, $observer, $args) {
 		}
 	}
 
-
 	$title = '';
 	$mid = item_message_id();