]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0446766 d72db2e)
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)
* 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:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.