From: friendica <info@friendica.com>
Date: Fri, 1 Jun 2012 09:53:42 +0000 (-0700)
Subject: Merge pull request #320 from fabrixxm/master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=974935e9215bce903e5d458c8301fa1d50b3178d;p=friendica.git

Merge pull request #320 from fabrixxm/master

Fix bug 436, fix small typo, and incomplete feature removal
---

974935e9215bce903e5d458c8301fa1d50b3178d