From: Evan Prodromou <evan@status.net>
Date: Tue, 8 Feb 2011 16:52:40 +0000 (-0500)
Subject: Merge branch 'testing'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8eb66467165e107d0c80c64f6c429fed1d1101d5;p=quix0rs-gnu-social.git

Merge branch 'testing'

Conflicts:
	plugins/Facebook/facebookaction.php
	plugins/Facebook/facebookhome.php
	plugins/Facebook/facebookutil.php
---

8eb66467165e107d0c80c64f6c429fed1d1101d5