From: Simon L'nu <simon.lnu@gmail.com>
Date: Thu, 26 Apr 2012 04:20:00 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6b830bfa97121ea6388722ef483440360ff4d4dd;p=friendica.git

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

* remotes/upstream/master:
  Diabook-dark more CSS fixes.

* master:
---

6b830bfa97121ea6388722ef483440360ff4d4dd