From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 18 Mar 2012 00:03:34 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=939c8d3c8d3dce18e136d9ddff5fb93f064c61c3;p=friendica.git

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

* remotes/upstream/master:
  compare ssl_policy precisely in case somebody was bitten by template processor bug
  template processor broken with foreach k=>v and k is integer 0

* master:
---

939c8d3c8d3dce18e136d9ddff5fb93f064c61c3