]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 3 May 2012 18:18:40 +0000 (14:18 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 3 May 2012 18:18:40 +0000 (14:18 -0400)
commit4c8a82456e9f4085984573a8a226ebe3d734aa6c
tree2f1d6384b3f68c360861715e12dcf59a48145411
parent0446766f0407b45c78031ad9e5029cc9218b025e
parentd72db2e1aa68833cbebc1c24ab4e1c6c9c966679
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: