Merge branch 'pull'
authorFriendika <info@friendika.com>
Thu, 16 Jun 2011 22:29:04 +0000 (15:29 -0700)
committerFriendika <info@friendika.com>
Thu, 16 Jun 2011 22:29:04 +0000 (15:29 -0700)
commitbb73c0b9f307accaa284820aaa11852c8481682f
treecc192702c535f5a477e72cd873ecf4f80c4568dc
parent0f3292fefb96016ad98b8f25746824d9e3cff31e
parent6709beb2ac776bb06bd0d9d7749faac9a065863c
Merge branch 'pull'
boot.php