From: Michael Vogel Date: Sat, 26 May 2012 13:42:23 +0000 (+0200) Subject: Merge branch 'master' of github.com:annando/friendica X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a08232fa955385b2eaff5f9094b39071fb1632ae;p=friendica.git Merge branch 'master' of github.com:annando/friendica --- a08232fa955385b2eaff5f9094b39071fb1632ae