From: Ian Denhardt Date: Fri, 13 Aug 2010 22:01:33 +0000 (-0400) Subject: Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=70c3532996b4239880607e705ffb4e9f9aaa692a;hp=-c;p=quix0rs-gnu-social.git Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline --- 70c3532996b4239880607e705ffb4e9f9aaa692a