]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of git://github.com/friendica/friendica
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Wed, 2 Jan 2013 10:10:59 +0000 (11:10 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Wed, 2 Jan 2013 10:10:59 +0000 (11:10 +0100)

Trivial merge