Merge branch '7.1' into testbench4

author Henri Sara <hesara@vaadin.com>

Tue, 12 Nov 2013 09:27:07 +0000 (11:27 +0200)

committer Henri Sara <hesara@vaadin.com>

Tue, 12 Nov 2013 09:27:07 +0000 (11:27 +0200)
author Henri Sara <hesara@vaadin.com>
Tue, 12 Nov 2013 09:27:07 +0000 (11:27 +0200)
committer Henri Sara <hesara@vaadin.com>
Tue, 12 Nov 2013 09:27:07 +0000 (11:27 +0200)
diff --cc client/src/com/vaadin/client/Util.java
Simple merge
diff --cc client/src/com/vaadin/client/ui/VScrollTable.java
Simple merge
diff --cc publish.xml
Simple merge
author	Henri Sara <hesara@vaadin.com>
	Tue, 12 Nov 2013 09:27:07 +0000 (11:27 +0200)
committer	Henri Sara <hesara@vaadin.com>
	Tue, 12 Nov 2013 09:27:07 +0000 (11:27 +0200)
		1	2
client/src/com/vaadin/client/Util.java	patch \|	diff1 \|	diff2 \|	blob \| history
client/src/com/vaadin/client/ui/VScrollTable.java	patch \|	diff1 \|	diff2 \|	blob \| history
publish.xml	patch \|	diff1 \|	diff2 \|	blob \| history