]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 28 Jun 2012 16:12:43 +0000 (12:12 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 28 Jun 2012 16:12:43 +0000 (12:12 -0400)
commit4ae5589df791635549511a90b88422f24170694a
tree1dbd867dc2f8aaf2736c087a080e11eaf704ac64
parent4f488c7e3cf1a4bc12e83dfdd44ede32283140ac
parent26156e1dc4d1f4948e847cd0e5e50304ef643b25
Merge remote-tracking branch 'remotes/upstream/master'

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