Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Tue, 28 May 2013 11:53:27 +0000 (04:53 -0700)
committerfriendica <info@friendica.com>
Tue, 28 May 2013 11:53:27 +0000 (04:53 -0700)

Trivial merge