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

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

* remotes/upstream/master:
  updated page plugin
  "page" addon - higher performance version of "pages" addon
  update pkg

* master:
---

1a2c142a9e3ce3f8cbcd675739525c3ccc6c2907