Merge https://github.com/friendica/friendica into pull
authorfriendica <info@friendica.com>
Fri, 15 Jun 2012 00:39:17 +0000 (17:39 -0700)
committerfriendica <info@friendica.com>
Fri, 15 Jun 2012 00:39:17 +0000 (17:39 -0700)
1  2 
boot.php

diff --cc boot.php
Simple merge