]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of https://github.com/friendica/friendica
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Wed, 8 Feb 2012 18:11:11 +0000 (19:11 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Wed, 8 Feb 2012 18:11:11 +0000 (19:11 +0100)

Trivial merge