From: Tobias Hößl Date: Tue, 13 Mar 2012 18:34:15 +0000 (+0000) Subject: Merge branch 'master' of git://github.com/friendica/friendica X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=43430ef561a004aca8a9a28449e51e3885d39a9a;p=friendica.git Merge branch 'master' of git://github.com/friendica/friendica --- 43430ef561a004aca8a9a28449e51e3885d39a9a