]> git.mxchange.org Git - friendica.git/commitdiff
Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Sun, 11 Nov 2012 21:58:17 +0000 (13:58 -0800)
committerfriendica <info@friendica.com>
Sun, 11 Nov 2012 21:58:17 +0000 (13:58 -0800)

Trivial merge