From: Brion Vibber <brion@pobox.com>
Date: Sun, 11 Apr 2010 00:56:11 +0000 (-0700)
Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1eeb23e1e3b77de056791a74cd3e4f5c02d68510;p=quix0rs-gnu-social.git

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

Conflicts:
	actions/confirmaddress.php
---

1eeb23e1e3b77de056791a74cd3e4f5c02d68510