From: Simon L'nu <simon.lnu@gmail.com>
Date: Tue, 1 May 2012 08:02:17 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=5d6296b81b43655d41320f99dde5ef6c9f1382f8;p=friendica.git

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

* remotes/upstream/master:
  hidden plugins (add .hidden file to dir)

* master:
---