From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 16 Mar 2012 22:35:50 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0e9d5e0ce869a75498e1f5eff847b6037d6c1f67;p=friendica.git

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

* remotes/upstream/master:
  wrong link in d* comment notifications

* master:
---