]> git.mxchange.org Git - friendica.git/commitdiff
Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Wed, 14 Nov 2012 22:00:08 +0000 (14:00 -0800)
committerfriendica <info@friendica.com>
Wed, 14 Nov 2012 22:00:08 +0000 (14:00 -0800)

Trivial merge