From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 4 Mar 2012 00:24:54 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=eae6418074d8c2addf85acf11e8f83165b847d04;p=friendica.git

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

* remotes/upstream/master:
  tag fix
  fix
  navbar fix

* master:
---