From: Sebastian Egbers Date: Tue, 26 Jun 2012 06:33:41 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/friendica/friendica X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0f0fb2e2f3b9819e4f1b65c3ea1b96e78c008381;p=friendica.git Merge branch 'master' of https://github.com/friendica/friendica --- 0f0fb2e2f3b9819e4f1b65c3ea1b96e78c008381