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

Trivial merge