From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 28 Feb 2012 10:25:05 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=718c5ea23e642f8eb3fd91670e5b8faf705df55b;p=friendica.git

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

* remotes/upstream/master:
  update globaldir when page-type changes, add spam date field
  clicking contact on contacts page broken link

* master:
---

718c5ea23e642f8eb3fd91670e5b8faf705df55b