Merge remote-tracking branch 'origin/declarative'

author Artur Signell <artur@vaadin.com>

Thu, 18 Dec 2014 07:57:52 +0000 (09:57 +0200)

committer Artur Signell <artur@vaadin.com>

Thu, 18 Dec 2014 07:58:08 +0000 (09:58 +0200)
author Artur Signell <artur@vaadin.com>
Thu, 18 Dec 2014 07:57:52 +0000 (09:57 +0200)
committer Artur Signell <artur@vaadin.com>
Thu, 18 Dec 2014 07:58:08 +0000 (09:58 +0200)
diff --cc server/src/com/vaadin/ui/AbstractSplitPanel.java
Simple merge
diff --cc server/src/com/vaadin/ui/TabSheet.java
Simple merge
author	Artur Signell <artur@vaadin.com>
	Thu, 18 Dec 2014 07:57:52 +0000 (09:57 +0200)
committer	Artur Signell <artur@vaadin.com>
	Thu, 18 Dec 2014 07:58:08 +0000 (09:58 +0200)
		1	2
server/src/com/vaadin/ui/AbstractSplitPanel.java	patch \|	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/ui/TabSheet.java	patch \|	diff1 \|	diff2 \|	blob \| history