Merge branch 'pull' 2.37
authorfriendica <info@friendica.com>
Wed, 11 Jan 2012 01:48:05 +0000 (17:48 -0800)
committerfriendica <info@friendica.com>
Wed, 11 Jan 2012 01:48:05 +0000 (17:48 -0800)

Trivial merge