From: Evan Prodromou <evan@e14n.com>
Date: Sun, 2 Jun 2013 18:29:40 +0000 (-0400)
Subject: Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=1fc305eca51f465f3d22a5d8140420768b4cb2fa;p=quix0rs-gnu-social.git

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

Conflicts:
	lib/useractivitystream.php
---

1fc305eca51f465f3d22a5d8140420768b4cb2fa