From: Evan Prodromou <evan@status.net>
Date: Thu, 30 Jun 2011 19:44:11 +0000 (-0400)
Subject: Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9f8d0b36a8c301ba192e79f7a00c69e22dbd5eda;p=quix0rs-gnu-social.git

Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x
---

9f8d0b36a8c301ba192e79f7a00c69e22dbd5eda