From: Brion Vibber <brion@pobox.com>
Date: Thu, 16 Dec 2010 23:56:19 +0000 (-0800)
Subject: Merge branch '0.9.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e79034e163967a375aee8a9afff54fd9c37030dd;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into 1.0.x

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

e79034e163967a375aee8a9afff54fd9c37030dd