From: Brion Vibber Date: Mon, 20 Dec 2010 22:23:15 +0000 (-0800) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b83e7005ed9dfe8675f9fbbae00650a8c6a62511;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x Conflicts: plugins/OStatus/classes/FeedSub.php --- b83e7005ed9dfe8675f9fbbae00650a8c6a62511