Merge branch 'omigeot-master'

author Friendika <info@friendika.com>

Mon, 14 Mar 2011 02:13:40 +0000 (19:13 -0700)

committer Friendika <info@friendika.com>

Mon, 14 Mar 2011 02:13:40 +0000 (19:13 -0700)
author Friendika <info@friendika.com>
Mon, 14 Mar 2011 02:13:40 +0000 (19:13 -0700)
committer Friendika <info@friendika.com>
Mon, 14 Mar 2011 02:13:40 +0000 (19:13 -0700)
diff --cc index.php
Simple merge
diff --cc view/fr/strings.php
Simple merge
author	Friendika <info@friendika.com>
	Mon, 14 Mar 2011 02:13:40 +0000 (19:13 -0700)
committer	Friendika <info@friendika.com>
	Mon, 14 Mar 2011 02:13:40 +0000 (19:13 -0700)
		1	2
index.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/fr/strings.php	patch \|	diff1 \|	diff2 \|	blob \| history