From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 2 Mar 2012 15:55:59 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=725daf2a5d31175764dc5110d2fa3e6bc60917bc;p=friendica.git

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

* remotes/upstream/master:
  template proc: allow isolation of var name between [ and ]
  group: fix create new group form
  templates: fix tags
  template proc: remove unused function and commented out code
  template proc: first optimization

* master:
---

725daf2a5d31175764dc5110d2fa3e6bc60917bc