From: James Walker <walkah@walkah.net>
Date: Sat, 13 Mar 2010 15:51:32 +0000 (-0500)
Subject: Merge remote branch 'statusnet/testing' into crypt-rsa-switch
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6ee536c258add47c586210cfa8815c03b4037bbe;p=quix0rs-gnu-social.git

Merge remote branch 'statusnet/testing' into crypt-rsa-switch
---

6ee536c258add47c586210cfa8815c03b4037bbe