From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 30 Mar 2012 12:24:45 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fdeac4284fcb94f82b15ae809d627861843e3979;p=friendica-addons.git

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

* remotes/upstream/master:
  package updates
  Remove rembemberoid plugin

* master:
---

fdeac4284fcb94f82b15ae809d627861843e3979