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

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

* remotes/upstream/master:
  fix in navbar

* master:
---

c4c98a998827fb0ec49d5b40d3e4439aa9146e24