From: Evan Prodromou <evan@status.net>
Date: Thu, 14 Apr 2011 22:28:03 +0000 (-0400)
Subject: Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=41dc9ca497dd065d72440cb2c706038f191a2c0c;p=quix0rs-gnu-social.git

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

Conflicts:
	classes/Profile.php
---

41dc9ca497dd065d72440cb2c706038f191a2c0c