From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 14 Apr 2012 19:12:39 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1dd22be4d2fe997d9bde552f8d8a25ba12c67e7e;p=friendica.git

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

* remotes/upstream/master:
  bogus empty list element in dfrn_request page when emailnet not enabled
  zrl on random profile
  zrl hook
  bug #372 - category feeds
  pass zrl's to/through global directory

* master:
---

1dd22be4d2fe997d9bde552f8d8a25ba12c67e7e