]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 30 Mar 2012 12:24:45 +0000 (08:24 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 30 Mar 2012 12:24:45 +0000 (08:24 -0400)
* remotes/upstream/master:
  package updates
  Remove rembemberoid plugin

* master:


Trivial merge