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

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

* remotes/upstream/master:
  still getting parent relays on remote systems
  revup

* master:
---