7 commits

Author	SHA1	Message	Date
Simon Kornblith	4e5d4281f1	Merge branch '3.0'	2012-05-26 18:24:52 -04:00
Dan Stillman	d456117ebe	Merge branch '3.0'	2012-05-03 17:56:32 -04:00
Dan Stillman	17e9c466d0	Merge branch '3.0'	2012-02-17 04:26:58 -05:00
Simon Kornblith	09813b145d	Merge branch '3.0'	2012-02-14 15:00:07 -05:00
Simon Kornblith	e29c87c77b	Merge branch '3.0'	2012-02-11 00:41:24 -05:00
Dan Stillman	3a4401a995	Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/integration.js chrome/content/zotero/xpcom/storage/webdav.js chrome/content/zotero/xpcom/storage/zfs.js install.rdf update.rdf	2012-02-09 02:13:02 -05:00
Simon Kornblith	be38be66f7	Don't unpack xpi	2012-01-29 15:15:23 -05:00