From: Michael Vogel Date: Tue, 22 Jul 2014 12:23:00 +0000 (+0200) Subject: Merge branch 'master' of github.com:annando/friendica X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c3c64d33bc45664f98ce52d5fdeda0114ae54542;p=friendica.git Merge branch 'master' of github.com:annando/friendica --- c3c64d33bc45664f98ce52d5fdeda0114ae54542