From: Evan Prodromou Date: Tue, 3 Jul 2012 16:27:10 +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=06b6b5fbc25135474282775e35671240f77e51e5;p=quix0rs-gnu-social.git Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x --- 06b6b5fbc25135474282775e35671240f77e51e5