Blakko 6e90bc41f6 Merge remote-tracking branch 'origin/master' into internationalization ... 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 11:07:59 +02:00
..
modules	Merge remote-tracking branch 'origin/master' into internationalization	2013-07-25 11:07:59 +02:00
WEB-INF	Update Apache HTTP client JARs to 4.2.5	2013-07-10 15:16:21 -04:00