From: Evan Prodromou Date: Mon, 16 Apr 2012 19:44:03 +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=7d07149f6070f0899dbaa4b4741b4db7ca94dec5;p=quix0rs-gnu-social.git Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x --- 7d07149f6070f0899dbaa4b4741b4db7ca94dec5