From: Hauke Zuehl <hzuehl@phone-talk.de>
Date: Sat, 16 Jun 2012 17:49:04 +0000 (+0200)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cc7d849ce393a57fe6bb347c48c9a02f7e483789;p=friendica.git

Merge remote branch 'upstream/master'
---

cc7d849ce393a57fe6bb347c48c9a02f7e483789