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

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

* remotes/upstream/master:
  warning cleanup

* master:
---

e940acf8c68ac72a2f55590306977e00f1523f2a