]> git.mxchange.org Git - friendica.git/commitdiff
Merge git://github.com/tobiasd/friendika
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 25 Jan 2011 11:47:02 +0000 (12:47 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Tue, 25 Jan 2011 11:47:02 +0000 (12:47 +0100)

Trivial merge