From: Brion Vibber <brion@pobox.com>
Date: Tue, 29 Mar 2011 23:26:20 +0000 (-0700)
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=674e3c2a0ef4d91f502974b34c8f58029accced7;p=quix0rs-gnu-social.git

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

Conflicts:
	actions/apistatusesretweet.php
	actions/repeat.php
	classes/Notice.php
	lib/command.php
---

674e3c2a0ef4d91f502974b34c8f58029accced7