]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of git://github.com/friendika/friendika
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 30 May 2011 04:19:59 +0000 (06:19 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 30 May 2011 04:19:59 +0000 (06:19 +0200)

Trivial merge