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

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

* remotes/upstream/master:
  initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term,  and theming.

* master:
---

1763a6c9c2a80642291e13f80be8a092465924ae