From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 7 Mar 2012 00:06:02 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d89cd6569bac3d157870b478b41f72c8958ea382;p=friendica.git

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

* remotes/upstream/master:
  improved smiley transparency

* master:
---

d89cd6569bac3d157870b478b41f72c8958ea382