]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of git://github.com/friendika/friendika
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 11 Jun 2011 06:33:02 +0000 (08:33 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 11 Jun 2011 06:33:02 +0000 (08:33 +0200)

Trivial merge