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

Trivial merge