From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 20 May 2012 18:33:15 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=18d4cf05833574173f1645e40e68f2c9c775517e;p=friendica.git

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

* remotes/upstream/master:
  search with leading @ performs directory search (# for tag search), nothing for text search
  Darkzero-NS + 'Friendicaland' countries.
  set comment permissions explicitly to parent permissions

* master:
---

18d4cf05833574173f1645e40e68f2c9c775517e