From: Thomas Willingham Date: Tue, 13 Nov 2012 15:52:16 +0000 (+0000) Subject: Merge branch 'master' of https://github.com/friendica/friendica X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4c6401cfb0be5f5266bfad3210169284e06d54ce;p=friendica.git Merge branch 'master' of https://github.com/friendica/friendica --- 4c6401cfb0be5f5266bfad3210169284e06d54ce