From: Brion Vibber <brion@pobox.com>
Date: Mon, 1 Mar 2010 22:55:09 +0000 (-0800)
Subject: Merge branch 'master' of gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7bbdea10327dfd5cd059337e4f2d3d5f21d909da;p=quix0rs-gnu-social.git

Merge branch 'master' of gitorious.org:statusnet/mainline into testing
---

7bbdea10327dfd5cd059337e4f2d3d5f21d909da