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 - www - Unnamed repository; edit this file 'description' to name the repository.

commit 11a27a8029ca6242390461018ecac0c4123c31f5
parent 2cc94e07c97c3b1691830d73a724c55027e1d93e
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun,  4 May 2008 20:42:48 +0000

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

	www Unnamed repository; edit this file 'description' to name the repository.
	Log \| Files \| Refs \| Submodules \| README \| LICENSE