From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 27 Feb 2012 18:34:19 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8c2bda46f7ad726da5cb69b96035142dc6dd1ca5;p=friendica.git

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

* remotes/upstream/master:
  revert 01a2791e3a to avoid random preg internal errors. fix contact_template

* master:
---

8c2bda46f7ad726da5cb69b96035142dc6dd1ca5