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

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

* remotes/upstream/master:
  also block outbound
  let's catch d* disabled at a higher level and not waste any resources on it.

* master:
---

9c4fca446bdff87d7858fdbf52bb2bed7fb70960