From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 3 Apr 2012 01:55:10 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=06942b36549668eb067650831f286d96aab14a40;p=friendica.git

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

* remotes/upstream/master:
  bug #363 and a couple of other reported ssl link issues

* master:
---

06942b36549668eb067650831f286d96aab14a40