From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 3 May 2012 18:18:40 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4c8a82456e9f4085984573a8a226ebe3d734aa6c;p=friendica.git

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

* remotes/upstream/master:
  diabook-theme: small fix
  Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.

* master:
---

4c8a82456e9f4085984573a8a226ebe3d734aa6c