From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 23 Apr 2012 02:22:52 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=29d7f260d7e6dc178862c6a6c16445ef9b3512e4;p=friendica.git

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

* remotes/upstream/master:
  bug #388 - notify_comment received after post deleted
  don't allow non-existent themes as choices
  diabook-themes: bugfix
  diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer
  api: add support for StatusNet-style media param to API
  Add a hook

* master:
---

29d7f260d7e6dc178862c6a6c16445ef9b3512e4