From: Evan Prodromou <evan@status.net>
Date: Mon, 9 Nov 2009 22:43:45 +0000 (-0500)
Subject: Merge branch 'master' into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8bcc58a9894e715dc1cb39eeb390bf8deefc13b7;p=quix0rs-gnu-social.git

Merge branch 'master' into 0.8.x

Conflicts:
	scripts/updateavatarurl.php
---

8bcc58a9894e715dc1cb39eeb390bf8deefc13b7