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

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

* remotes/upstream/master:
  diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes

* master:
---

83683b516ec058d0e5fdd0d4a1defbd22a60c322