From: Friendika <info@friendika.com>
Date: Sat, 5 Feb 2011 21:01:28 +0000 (-0800)
Subject: Merge branch 'omigeot-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c26463b65b4b98f9aca77781fd74a7fe99f73814;p=friendica.git

Merge branch 'omigeot-master'

Conflicts:
	view/fr/strings.php
---

c26463b65b4b98f9aca77781fd74a7fe99f73814