Merge branch 'master' into grid-7.5

author Pekka Hyvönen <pekka@vaadin.com>

Fri, 17 Apr 2015 06:42:07 +0000 (09:42 +0300)

committer Pekka Hyvönen <pekka@vaadin.com>

Fri, 17 Apr 2015 06:42:52 +0000 (09:42 +0300)
author Pekka Hyvönen <pekka@vaadin.com>
Fri, 17 Apr 2015 06:42:07 +0000 (09:42 +0300)
committer Pekka Hyvönen <pekka@vaadin.com>
Fri, 17 Apr 2015 06:42:52 +0000 (09:42 +0300)
diff --cc WebContent/VAADIN/themes/base/grid/grid.scss
Simple merge
diff --cc client/src/com/vaadin/client/widgets/Grid.java
Simple merge
diff --cc server/src/com/vaadin/ui/Grid.java
Simple merge
diff --cc server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java
Simple merge
author	Pekka Hyvönen <pekka@vaadin.com>
	Fri, 17 Apr 2015 06:42:07 +0000 (09:42 +0300)
committer	Pekka Hyvönen <pekka@vaadin.com>
	Fri, 17 Apr 2015 06:42:52 +0000 (09:42 +0300)
		1	2
WebContent/VAADIN/themes/base/grid/grid.scss	patch \|	diff1 \|	diff2 \|	blob \| history
client/src/com/vaadin/client/widgets/Grid.java	patch \|	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/ui/Grid.java	patch \|	diff1 \|	diff2 \|	blob \| history
server/tests/src/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java	patch \|	diff1 \|	diff2 \|	blob \| history