]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of git://github.com/friendica/friendica
authorAlexander Kampmann <programmer@nurfuerspam.de>
Fri, 9 Mar 2012 11:17:19 +0000 (12:17 +0100)
committerAlexander Kampmann <programmer@nurfuerspam.de>
Fri, 9 Mar 2012 11:17:19 +0000 (12:17 +0100)

Trivial merge