Merge branch 'pull'
authorfriendica <info@friendica.com>
Sun, 8 Apr 2012 23:29:54 +0000 (16:29 -0700)
committerfriendica <info@friendica.com>
Sun, 8 Apr 2012 23:29:54 +0000 (16:29 -0700)

Trivial merge