From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 26 Mar 2012 07:38:19 +0000 (-0400)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7fad65d7af43414d744f4d5d1e75c0f181de9cf8;p=friendica.git

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

* remotes/upstream/master:
  add screenshots to diabook

* master:
---