From: friendica <info@friendica.com>
Date: Sat, 11 Aug 2012 22:42:48 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6348634a1b7c44967f16c1f889bff2bfa85e68d1;p=friendica.git

Merge https://github.com/friendica/friendica into pull

Conflicts:
	view/wall_thread.tpl
---

6348634a1b7c44967f16c1f889bff2bfa85e68d1