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

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

* remotes/upstream/master:
  diabook-themes: theme-settings: "wide"-option and new screenshots

* master:
---