Tom Morris 218ea46a4d Merge remote-tracking branch 'blakko/internationalization' - close #755 ... Conflicts: extensions/freebase/module/scripts/dialogs/schema-alignment/schema-alignment-dialog.html main/webapp/modules/core/index.vt main/webapp/modules/core/project.vt main/webapp/modules/core/scripts/project/browsing-engine.js main/webapp/modules/core/scripts/project/history-panel.html		2013-07-25 10:53:25 -04:00
..
modules	Merge remote-tracking branch 'blakko/internationalization' - close #755	2013-07-25 10:53:25 -04:00
WEB-INF	Update Apache HTTP client JARs to 4.2.5	2013-07-10 15:16:21 -04:00