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

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

* remotes/upstream/master:
  not yet linked adult_smiles
  pkg update
  deleted:    smiley_pack/smiley_pack.php~
  First set of smilies for smiley_pack

* master:
---

141bac1714f0ce6f3ea072f31acaf33a9185819b