Merge branch 'pull'
authorfriendica <info@friendica.com>
Sat, 24 Mar 2012 09:32:15 +0000 (02:32 -0700)
committerfriendica <info@friendica.com>
Sat, 24 Mar 2012 09:32:15 +0000 (02:32 -0700)

Trivial merge