From: Brion Vibber <brion@pobox.com>
Date: Mon, 25 Oct 2010 20:14:33 +0000 (-0700)
Subject: Merge branch '1.0.x' into schema-x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b483a0549f115b2d5f2cfb3d447e6cc5c4f469f3;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into schema-x

Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
---

b483a0549f115b2d5f2cfb3d447e6cc5c4f469f3