Merge branch 'pull'
authorfriendica <info@friendica.com>
Fri, 2 Mar 2012 02:54:50 +0000 (18:54 -0800)
committerfriendica <info@friendica.com>
Fri, 2 Mar 2012 02:54:50 +0000 (18:54 -0800)

Trivial merge