]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of git://github.com/friendika/friendika
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Thu, 20 Jan 2011 07:17:41 +0000 (08:17 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Thu, 20 Jan 2011 07:17:41 +0000 (08:17 +0100)

Trivial merge