From: Evan Prodromou <evan@status.net>
Date: Fri, 1 Jan 2010 21:20:25 +0000 (-1000)
Subject: Merge branch 'master' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a9d835920824c48caef2a66686d6605ff54586b3;p=quix0rs-gnu-social.git

Merge branch 'master' into 0.9.x

Conflicts:
	classes/Memcached_DataObject.php
---

a9d835920824c48caef2a66686d6605ff54586b3