]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of git://github.com/friendica/friendica
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 28 Jan 2013 06:00:07 +0000 (07:00 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 28 Jan 2013 06:00:07 +0000 (07:00 +0100)

Trivial merge