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/mod/events.php b/mod/events.php
index 077095fbe..a89bbb760 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -414,7 +414,7 @@ function events_content(&$a) {
 				$is_first = ($d !== $last_date);
 					
 				$last_date = $d;
-// FIXME
+
 				$edit = (intval($rr['item_wall']) ? array($a->get_baseurl().'/events/event/'.$rr['event_hash'],t('Edit event'),'','') : null);
 
 				$drop = array($a->get_baseurl().'/events/drop/'.$rr['event_hash'],t('Delete event'),'','');