]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of https://github.com/friendica/friendica
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Fri, 6 Apr 2012 10:43:44 +0000 (12:43 +0200)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Fri, 6 Apr 2012 10:43:44 +0000 (12:43 +0200)

Trivial merge