From 11a27a8029ca6242390461018ecac0c4123c31f5 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 4 May 2008 20:42:48 +0000
Subject: [PATCH] Recorded merge of already-integrated revisions
 2378,2403-2404,2439,2442,2492,2541-2542,2554 via svnmerge from
 https://www.zotero.org/svn/extension/branches/1.0