Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixxm-issue-11

author Friendika <info@friendika.com>

Wed, 9 Mar 2011 08:17:47 +0000 (00:17 -0800)

committer Friendika <info@friendika.com>

Wed, 9 Mar 2011 08:17:47 +0000 (00:17 -0800)
author Friendika <info@friendika.com>
Wed, 9 Mar 2011 08:17:47 +0000 (00:17 -0800)
committer Friendika <info@friendika.com>
Wed, 9 Mar 2011 08:17:47 +0000 (00:17 -0800)
diff --cc mod/network.php
Simple merge
diff --cc mod/profile.php
Simple merge
author	Friendika <info@friendika.com>
	Wed, 9 Mar 2011 08:17:47 +0000 (00:17 -0800)
committer	Friendika <info@friendika.com>
	Wed, 9 Mar 2011 08:17:47 +0000 (00:17 -0800)
		1	2
mod/network.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/profile.php	patch \|	diff1 \|	diff2 \|	blob \| history