From: Evan Prodromou <evan@status.net>
Date: Sun, 10 Jan 2010 22:18:19 +0000 (-0800)
Subject: Merge branch 'master' into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=866dfa6822df54765a9b92336722d86cfad6b123;p=quix0rs-gnu-social.git

Merge branch 'master' into 0.9.x

Conflicts:
	classes/Memcached_DataObject.php
---

866dfa6822df54765a9b92336722d86cfad6b123