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

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

* remotes/upstream/master:
  well that was a stupid mistake...
  string update
  bug: diaspora_enabled setting turns it on but doesn't fully turn it off.
  better handling of reshares containing embeds

* master:
---