Dan Stillman e7d7d2a943 Merge branch '4.0' ... Conflicts: install.rdf update.rdf		2013-03-26 15:10:38 -04:00
..
content	Merge branch '4.0'	2013-03-26 15:10:38 -04:00
locale	Update locales from Transifex	2013-03-26 13:35:27 -04:00
skin/default/zotero	Fix positioning of sync error popup	2013-03-22 17:56:53 -04:00