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

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

* remotes/upstream/master:
  diabook-themes: small fix

* master:
---