Dan Stillman feb47caa6b Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/translation/translate.js		2014-08-06 22:13:05 -04:00
..
content	Merge branch '4.0'	2014-08-06 22:13:05 -04:00
locale	Merge locales from Transifex	2014-06-19 02:05:29 -04:00
skin/default/zotero	Error report improvements	2014-05-26 20:07:41 -04:00