Merge https://github.com/friendica/friendica-addons into apull
authorfriendica <info@friendica.com>
Thu, 13 Dec 2012 11:01:41 +0000 (03:01 -0800)
committerfriendica <info@friendica.com>
Thu, 13 Dec 2012 11:01:41 +0000 (03:01 -0800)

Trivial merge