From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 21 Mar 2012 01:41:53 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6abe6b0a65aed03146bc3a14f160f81aa64326bb;p=friendica-addons.git

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

* remotes/upstream/master:
  updated default profile photo
  modified:   smiley_pack/smiley_pack.php
  clean up

* master:
---

6abe6b0a65aed03146bc3a14f160f81aa64326bb