From: Evan Prodromou <evan@status.net>
Date: Thu, 7 Jul 2011 14:27:54 +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=feb53619cfbc9fdb7d9dd0ad232b3aa81e9bc0e2;p=quix0rs-gnu-social.git

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

Conflicts:
	js/util.min.js
---

feb53619cfbc9fdb7d9dd0ad232b3aa81e9bc0e2