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

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

* remotes/upstream/master:
  deleted readme.txt from folder diabook
  github finally working
  adjust3
  adjust2
  adjust

* master:
---