]> git.mxchange.org Git - friendica.git/commitdiff
Merge branch 'master' of https://github.com/friendica/friendica
authorThomas Willingham <founder@kakste.com>
Tue, 27 Nov 2012 23:58:00 +0000 (23:58 +0000)
committerThomas Willingham <founder@kakste.com>
Tue, 27 Nov 2012 23:58:00 +0000 (23:58 +0000)

Trivial merge