Simon Kornblith 1ed47f4823 Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/attachments.js chrome/content/zotero/xpcom/utilities.js		2012-10-29 15:54:44 -04:00
..
zotero	Merge branch '3.0'	2012-10-29 15:54:44 -04:00
zotero-platform	Merge branch '3.0'	2012-03-20 02:16:43 -04:00