From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 27 May 2009 03:24:01 +0000 (-0400)
Subject: Merge branch '0.8.x' into userdesign
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=648d967226f3b47aa6237d2be9d1a82df4f78402;p=quix0rs-gnu-social.git

Merge branch '0.8.x' into userdesign

Conflicts:
	lib/attachmentlist.php
	lib/noticelist.php
---

648d967226f3b47aa6237d2be9d1a82df4f78402