From: Michael Date: Sat, 19 May 2012 14:55:33 +0000 (+0200) Subject: Merge branch 'master' of github.com:annando/friendica X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6342b3e0bdd5774857a8fca809994f05e0208d25;p=friendica.git Merge branch 'master' of github.com:annando/friendica --- 6342b3e0bdd5774857a8fca809994f05e0208d25