Merge branch 'fabrixxm-master'
authorFriendika <info@friendika.com>
Wed, 23 Mar 2011 21:32:23 +0000 (14:32 -0700)
committerFriendika <info@friendika.com>
Wed, 23 Mar 2011 21:32:23 +0000 (14:32 -0700)
1  2 
boot.php

diff --cc boot.php
Simple merge