From: Evan Prodromou <evan@status.net>
Date: Mon, 22 Aug 2011 23:02:16 +0000 (-0400)
Subject: Merge branch '1.0.x' into activity
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6c7880c5c5b83c74133b45d4e99b8f145566b248;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into activity
---

6c7880c5c5b83c74133b45d4e99b8f145566b248