]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 18 Mar 2012 00:03:34 +0000 (20:03 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 18 Mar 2012 00:03:34 +0000 (20:03 -0400)
commit939c8d3c8d3dce18e136d9ddff5fb93f064c61c3
tree2dafebccd7de10089eef3dd1356a5760a280b590
parentc7759af8c5375d3201b8185b61b6fc6feef98df0
parent26258bca77aa3385dacf36874f7f5603eaef9a6b
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: