Dan Stillman 059460a5d2 Merge branch '3.0' ... Conflicts: chrome/content/zotero/xpcom/storage/webdav.js chrome/content/zotero/zoteroPane.js chrome/skin/default/zotero/preferences.css		2011-12-17 16:25:58 -05:00
..
zotero	Merge branch '3.0'	2011-12-17 16:25:58 -05:00