From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 6 Mar 2012 23:15:45 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=94d4cad701ab6b618afb288c88165c0ec17ae238;p=friendica.git

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

* remotes/upstream/master:
  string update
  [PRIVACY] privacy issue bug #314

* master:
---