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

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

* remotes/upstream/master:
  syntax error from pasted text, remove ^M's
  bug #335 network search broken after new ssl policy settings
  whitespace
  notification for disapora comments

* master:
---

a8c1cbc65592b58beb2042defa476acdd27fe8fd