]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of https://github.com/friendica/friendica
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 30 Apr 2012 06:40:06 +0000 (08:40 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Mon, 30 Apr 2012 06:40:06 +0000 (08:40 +0200)

Trivial merge