From: Evan Prodromou <evan@status.net>
Date: Mon, 4 Jul 2011 16:26:59 +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=144755d1c9e913c81a0beeed5fc0e7c69ba61941;p=quix0rs-gnu-social.git

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

144755d1c9e913c81a0beeed5fc0e7c69ba61941