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

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

* remotes/upstream/master:
  fix url and network display

* master:
---

21d1dc48a8e83e55c55d894f85b742ef667553d7