From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 16 May 2012 03:40:35 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a3137eec11ddd4c5d3e2b4f2c45fcfb356d2c2b0;p=friendica.git

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

* remotes/upstream/master:
  update tinymce to 3.5.0.1
  rev update
  DE strings
  slackr drop shadows extended
  Allow plugins to modify the contact photo menu
  rev update

* master:
---

a3137eec11ddd4c5d3e2b4f2c45fcfb356d2c2b0