Merge branch 'pull'
authorFriendika <info@friendika.com>
Sat, 3 Sep 2011 02:28:06 +0000 (19:28 -0700)
committerFriendika <info@friendika.com>
Sat, 3 Sep 2011 02:28:06 +0000 (19:28 -0700)

Trivial merge