Simon Kornblith b3f9f5102b Merge branch '3.0' ... Conflicts: chrome/content/zotero/overlay.js chrome/content/zotero/xpcom/schema.js		2012-02-28 17:22:34 -05:00
..
content	Merge branch '3.0'	2012-02-28 17:22:34 -05:00
locale	Merge branch '3.0'	2012-02-28 17:22:34 -05:00
skin/default/zotero	Closes #48, Additional field in QuickFormat dialog showing the name of the library and providing a link to the item with the following modifications	2012-02-19 18:37:42 -05:00