Tom Morris 00dd7f2bdd Merge branch 'master' into fusiontables-migration ... Conflicts: .classpath extensions/gdata/module/MOD-INF/controller.js extensions/gdata/src/com/google/refine/extension/gdata/GDataImporter.java		2013-07-25 16:13:04 -04:00
..
gdata	Merge branch 'master' into fusiontables-migration	2013-07-25 16:13:04 -04:00