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

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

* remotes/upstream/master:
  adult_smile addon
  updating packages
  fix spelling from copy and paste, Twitter is not StatusNet (not yet anyway)

* master:
---

634183ac2f92527afda478b2c75c7c374c64fe78