From: Simon L'nu <simon.lnu@gmail.com>
Date: Sat, 12 May 2012 19:55:03 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=89df33f0a8f03116a31351fbaa0aed23767bc3ef;p=friendica.git

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

* remotes/upstream/master:
  diabook-theme: fix in earthlayers
  diabook-theme: some fixes

* master:
---