From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 10 Jun 2009 04:51:24 +0000 (-0700)
Subject: Merge branch '0.8.x' into userdesign
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4df1ea49ec75ec9dd64bc8f58c01e64ea18bedc7;p=quix0rs-gnu-social.git

Merge branch '0.8.x' into userdesign

Conflicts:
	actions/designsettings.php
---

4df1ea49ec75ec9dd64bc8f58c01e64ea18bedc7