Merge branch 'pull'

author friendica <info@friendica.com>

Tue, 13 Mar 2012 22:41:13 +0000 (15:41 -0700)

committer friendica <info@friendica.com>

Tue, 13 Mar 2012 22:41:13 +0000 (15:41 -0700)
author friendica <info@friendica.com>
Tue, 13 Mar 2012 22:41:13 +0000 (15:41 -0700)
committer friendica <info@friendica.com>
Tue, 13 Mar 2012 22:41:13 +0000 (15:41 -0700)
diff --cc boot.php
Simple merge
diff --cc mod/dfrn_request.php
Simple merge
author	friendica <info@friendica.com>
	Tue, 13 Mar 2012 22:41:13 +0000 (15:41 -0700)
committer	friendica <info@friendica.com>
	Tue, 13 Mar 2012 22:41:13 +0000 (15:41 -0700)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/dfrn_request.php	patch \|	diff1 \|	diff2 \|	blob \| history