From: Zach Copley <zach@status.net>
Date: Mon, 28 Feb 2011 23:51:46 +0000 (-0800)
Subject: Missed a couple of conflicts
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f3ffc8bc46ebe5f2329bdf54fa28d4832c3a02f9;hp=f3ffc8bc46ebe5f2329bdf54fa28d4832c3a02f9;p=quix0rs-gnu-social.git

Missed a couple of conflicts
---