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

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

* remotes/upstream/master:
  profile wall privacy
  don't expire filed items

* master:
---

cc33a564e1658d32bb5bc3ad0abdfbe6871cf945