Dan Stillman 4caae896cf Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/attachments.js chrome/content/zotero/xpcom/translation/translate_item.js install.rdf update.rdf		2012-11-23 01:49:32 -05:00
..
content	Merge branch '3.0'	2012-11-23 01:49:32 -05:00
locale	Merge branch '3.0'	2012-11-20 03:22:49 -05:00
skin/default/zotero	Merge branch '3.0'	2012-09-10 17:18:08 -04:00