From: Evan Prodromou Date: Wed, 26 Jun 2013 02:27:23 +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=660b8f0c9c05a9416506ca7ae5493839f09c03ce;p=quix0rs-gnu-social.git Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x --- 660b8f0c9c05a9416506ca7ae5493839f09c03ce