From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 2 Mar 2012 15:39:04 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=472a019922c6a6e3a55b48f7687c048813484335;hp=e81e7f7e79710233c0aeac9f8039bf6548cf8013;p=friendica-addons.git

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  blockem: fix to work with changed 'display_item' hook

* master:
---