Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Tue, 15 Nov 2011 20:09:22 +0000 (12:09 -0800)
committerfriendica <info@friendica.com>
Tue, 15 Nov 2011 20:09:22 +0000 (12:09 -0800)

Trivial merge