From: Friendika <info@friendika.com>
Date: Tue, 15 Feb 2011 21:40:25 +0000 (-0800)
Subject: Merge branch 'fabrixxm-master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c5f5102396cee8ec691fd22d486070ec3d5f243d;p=friendica.git

Merge branch 'fabrixxm-master'

Conflicts:
	addon/statusnet/statusnet.php
	util/strings.php
---

c5f5102396cee8ec691fd22d486070ec3d5f243d