From: Simon L'nu <simon.lnu@gmail.com>
Date: Sun, 4 Mar 2012 09:58:12 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a6d08ec8523ea45d6958882d4864232de0902b3b;p=friendica.git

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

* remotes/upstream/master:
  some fixes in diabook

* master:
---

a6d08ec8523ea45d6958882d4864232de0902b3b