From: Evan Prodromou <evan@status.net>
Date: Sat, 6 Feb 2010 10:24:12 +0000 (+0100)
Subject: Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=823939ca84bd19ced394771d3f08b7c72a9dec84;p=quix0rs-gnu-social.git

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

823939ca84bd19ced394771d3f08b7c72a9dec84