From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 3 Feb 2009 20:12:55 +0000 (-0500)
Subject: Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0356953cf853bf3bc9eda66f88b5ef4718683337;p=quix0rs-gnu-social.git

Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x
---

0356953cf853bf3bc9eda66f88b5ef4718683337