Merge branch 'master' into notify

author friendica <info@friendica.com>

Thu, 22 Dec 2011 23:42:01 +0000 (15:42 -0800)

committer friendica <info@friendica.com>

Thu, 22 Dec 2011 23:42:01 +0000 (15:42 -0800)
author friendica <info@friendica.com>
Thu, 22 Dec 2011 23:42:01 +0000 (15:42 -0800)
committer friendica <info@friendica.com>
Thu, 22 Dec 2011 23:42:01 +0000 (15:42 -0800)
diff --cc boot.php
Simple merge
diff --cc mod/profile.php
Simple merge
author	friendica <info@friendica.com>
	Thu, 22 Dec 2011 23:42:01 +0000 (15:42 -0800)
committer	friendica <info@friendica.com>
	Thu, 22 Dec 2011 23:42:01 +0000 (15:42 -0800)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/profile.php	patch \|	diff1 \|	diff2 \|	blob \| history