From: Evan Prodromou Date: Sat, 11 Sep 2010 02:20:52 +0000 (-0400) Subject: Merge branch '1.0.x' into shortcontrol10x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=12eee30586dbac883e39adf453586ffef9189214;p=quix0rs-gnu-social.git Merge branch '1.0.x' into shortcontrol10x --- 12eee30586dbac883e39adf453586ffef9189214