]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of git://github.com/friendika/friendika
authorroot <root@diekershoff.homeunix.net>
Sat, 18 Dec 2010 09:56:44 +0000 (10:56 +0100)
committerroot <root@diekershoff.homeunix.net>
Sat, 18 Dec 2010 09:56:44 +0000 (10:56 +0100)

Trivial merge