From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 10 Mar 2012 05:15:29 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=665ad7e6600778c446aa9c5fc48ed32b309e64a7;p=friendica.git

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

* remotes/upstream/master:
  spec directory
  allow user to set number of items to show on network page
  revup

* master:
---

665ad7e6600778c446aa9c5fc48ed32b309e64a7