]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of git://github.com/friendika/friendika
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 22 Mar 2011 05:50:47 +0000 (06:50 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 22 Mar 2011 05:50:47 +0000 (06:50 +0100)

Trivial merge