]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of https://github.com/friendica/friendica
authorTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 17 Mar 2012 11:29:21 +0000 (12:29 +0100)
committerTobias Diekershoff <tobias.diekershoff@gmx.net>
Sat, 17 Mar 2012 11:29:21 +0000 (12:29 +0100)

Trivial merge