From: Brion Vibber <brion@pobox.com>
Date: Thu, 28 Oct 2010 23:27:53 +0000 (-0700)
Subject: Merge branch '1.0.x' into schema-x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e7c7fd39fc948f1169512916077185dd29973b60;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into schema-x

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

e7c7fd39fc948f1169512916077185dd29973b60