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

Trivial merge