]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 3 Apr 2012 01:55:10 +0000 (21:55 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 3 Apr 2012 01:55:10 +0000 (21:55 -0400)
commit06942b36549668eb067650831f286d96aab14a40
tree3955d7ec0947c1caf0c116a7c60daf8735e1bec5
parent9cb3fc226a9246b36810338f0ee8a115738cc97b
parent9391fc965d68fea5fc18e93a1583e90d8f11bd02
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master: