From: Brion Vibber <brion@pobox.com>
Date: Fri, 11 Mar 2011 01:55:08 +0000 (-0800)
Subject: Merge branch 'magic' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=17dc1c8703bf0fd95e9d3631209ea7c9fcc5b800;p=quix0rs-gnu-social.git

Merge branch 'magic' into 1.0.x
---

17dc1c8703bf0fd95e9d3631209ea7c9fcc5b800