Merge branch 'pull'
authorfriendica <info@friendica.com>
Wed, 15 Feb 2012 22:13:20 +0000 (14:13 -0800)
committerfriendica <info@friendica.com>
Wed, 15 Feb 2012 22:13:20 +0000 (14:13 -0800)

Trivial merge