From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Fri, 1 May 2009 00:16:25 +0000 (+0000)
Subject: Merge branch '0.7.x' into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d30df0790818d77b81ee8b271b9bd8ebe3063ee7;p=quix0rs-gnu-social.git

Merge branch '0.7.x' into 0.8.x

Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css
---

d30df0790818d77b81ee8b271b9bd8ebe3063ee7