From: friendica <info@friendica.com>
Date: Wed, 19 Sep 2012 22:39:19 +0000 (-0700)
Subject: Merge https://github.com/friendica/friendica into pull
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=51bee79b21d1d8ed6cd13c0efc4afeaa3ec5d807;p=friendica.git

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

Conflicts:
	view/theme/smoothly/follow.tpl
---

51bee79b21d1d8ed6cd13c0efc4afeaa3ec5d807