From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 9 Mar 2012 04:59:43 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=20b2090182dc2a62adcbfb0ff844574e0596756d;p=friendica.git

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

* remotes/upstream/master:
  removed info
  add info
  fixed star-bug
  More improved transparency for smilies
  removed dolphin file (wtf?)
  .

* master:
---

20b2090182dc2a62adcbfb0ff844574e0596756d