Merge remote-tracking branch 'origin/7.1' into testbench4

author Patrik Lindström <patrik@vaadin.com>

Fri, 11 Oct 2013 11:23:52 +0000 (14:23 +0300)

committer Patrik Lindström <patrik@vaadin.com>

Fri, 11 Oct 2013 11:27:29 +0000 (14:27 +0300)
author Patrik Lindström <patrik@vaadin.com>
Fri, 11 Oct 2013 11:23:52 +0000 (14:23 +0300)
committer Patrik Lindström <patrik@vaadin.com>
Fri, 11 Oct 2013 11:27:29 +0000 (14:27 +0300)
diff --cc client/src/com/vaadin/client/ApplicationConfiguration.java
Simple merge
diff --cc client/src/com/vaadin/client/ApplicationConnection.java
Simple merge
diff --cc client/src/com/vaadin/client/ui/VScrollTable.java
Simple merge
author	Patrik Lindström <patrik@vaadin.com>
	Fri, 11 Oct 2013 11:23:52 +0000 (14:23 +0300)
committer	Patrik Lindström <patrik@vaadin.com>
	Fri, 11 Oct 2013 11:27:29 +0000 (14:27 +0300)
		1	2
client/src/com/vaadin/client/ApplicationConfiguration.java	patch \|	diff1 \|	diff2 \|	blob \| history
client/src/com/vaadin/client/ApplicationConnection.java	patch \|	diff1 \|	diff2 \|	blob \| history
client/src/com/vaadin/client/ui/VScrollTable.java	patch \|	diff1 \|	diff2 \|	blob \| history