From: Evan Prodromou <evan@status.net>
Date: Tue, 5 Apr 2011 17:16:28 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?p=quix0rs-gnu-social.git;a=commitdiff_plain;h=36b331d469b6dcd1101783f21265f7be624bc58f

Merge branch '1.0.x' into testing

Conflicts:
	plugins/Event/RSVP.php
---

36b331d469b6dcd1101783f21265f7be624bc58f