Merge branch 'pull'
authorfriendica <info@friendica.com>
Sat, 28 Jan 2012 21:24:53 +0000 (13:24 -0800)
committerfriendica <info@friendica.com>
Sat, 28 Jan 2012 21:24:53 +0000 (13:24 -0800)

Trivial merge