From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 28 Jun 2012 16:12:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4ae5589df791635549511a90b88422f24170694a;p=friendica.git

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

* remotes/upstream/master:
  fix logic for nested lists--should be OR, not AND
---

4ae5589df791635549511a90b88422f24170694a