Dan Stillman 60ae71d964 Merge r6708 from branch to trunk		2010-09-09 22:01:53 +00:00
..
content	Merge r6708 from branch to trunk	2010-09-09 22:01:53 +00:00
locale	closes #1684, checkbox to temporarily disable proxy code	2010-08-01 20:10:18 +00:00
skin/default/zotero	- Add instructions line to CR window saying to click Next/Done	2010-09-05 07:18:06 +00:00