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

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

* remotes/upstream/master:
  more ssl policy stuff
  allow force ssl on notifications

* master:
---

24f5e6b3f3f1f29cce8923c38fbdfb24fa5ed5a5