From: Evan Prodromou <evan@status.net>
Date: Thu, 3 Jun 2010 19:59:59 +0000 (-0400)
Subject: Merge branch 'newmaster'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=22d6ff25b55d803643ea8d024b56e645be6fc450;p=quix0rs-gnu-social.git

Merge branch 'newmaster'
---

22d6ff25b55d803643ea8d024b56e645be6fc450