From: Michael Vogel Date: Thu, 19 Jun 2014 21:01:33 +0000 (+0200) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7eea5fc212c315898c042af14bdd6d734715a48d;p=friendica.git Merge remote-tracking branch 'upstream/master' --- 7eea5fc212c315898c042af14bdd6d734715a48d