]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 27 Feb 2012 18:34:19 +0000 (13:34 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 27 Feb 2012 18:34:19 +0000 (13:34 -0500)
commit8c2bda46f7ad726da5cb69b96035142dc6dd1ca5
treee9b11902c9fe447d1057b8474b85c527a5667cac
parentb1cdc5a93273f7536cb1a3c9870214f6d0aaaed0
parente11b51aca14ea36b514fdd4348443f4fae79b2ca
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

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

* master: