From f10f0bc0d77c629a2c08269835f1268f9e5fc3d1 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 29 Dec 2008 07:50:32 +0000
Subject: [PATCH] Block irrelevant, already merged, and conflicting changes
 from branch -- some will be merged manually