]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 5 Apr 2012 04:03:30 +0000 (00:03 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 5 Apr 2012 04:03:30 +0000 (00:03 -0400)
commit9c4fca446bdff87d7858fdbf52bb2bed7fb70960
tree0db8748c1bd090895906bd5d141c6f8da78bb849
parent9860d6b95ce1ac3d1ed6e4256df5874d06b9e2ea
parent37801dd6ed60776fc128d44f0d63a57e1b5e37d0
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: