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

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

* remotes/upstream/master:
  slight change to get_avatar hook, also provided readable text for gravatar default options - the admin settings part of this plugin needs some work.
  please use make
  Do not meddle in Imperial affairs. This correction is none of your concern.
  minor correction
  added Random Planets, Empirial Version Also, "blogger", but that is still in progress and untested.
  Add Gravatar plugin.

* master:
---

0efe8a922edac0f0dee9dd7d976fd446ce94fa4f