From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 5 Mar 2012 15:17:34 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3ab7132b640933fa5247d7783c958e3a95e6410b;p=friendica.git

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

* remotes/upstream/master:
  $name appearing on testbubble items
  testbubble notifications

* master:
---