From: Zach Copley <zach@controlyourself.ca>
Date: Sun, 14 Jun 2009 00:23:48 +0000 (+0000)
Subject: Merge branch '0.8.x' into userdesign
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d0eb2058a519941e205f7b0960d9a5e0707207bb;p=quix0rs-gnu-social.git

Merge branch '0.8.x' into userdesign

Conflicts:

	actions/showfavorites.php
	lib/action.php
---

d0eb2058a519941e205f7b0960d9a5e0707207bb