From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 3 Mar 2012 00:05:41 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=705b4a00ce7d127d80da87f96aca3210476978c0;p=friendica.git

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

* remotes/upstream/master:
  fix @mention autocomplete in comments
  template proc: fix variables regexp

* master:
---