]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of git://github.com/friendika/friendika
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Wed, 15 Jun 2011 05:02:38 +0000 (07:02 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Wed, 15 Jun 2011 05:02:38 +0000 (07:02 +0200)

Trivial merge