Merge commit 'd461fb438f62b38d2082b41b0a3c7a1189927c3d'

author Leif Åstrand <leif@vaadin.com>

Fri, 18 Oct 2013 14:21:14 +0000 (17:21 +0300)

committer Leif Åstrand <leif@vaadin.com>

Fri, 18 Oct 2013 14:21:31 +0000 (17:21 +0300)
author Leif Åstrand <leif@vaadin.com>
Fri, 18 Oct 2013 14:21:14 +0000 (17:21 +0300)
committer Leif Åstrand <leif@vaadin.com>
Fri, 18 Oct 2013 14:21:31 +0000 (17:21 +0300)
diff --cc server/src/com/vaadin/server/VaadinService.java
Simple merge
diff --cc server/src/com/vaadin/server/VaadinSession.java
Simple merge
diff --cc server/src/com/vaadin/ui/UI.java
Simple merge
author	Leif Åstrand <leif@vaadin.com>
	Fri, 18 Oct 2013 14:21:14 +0000 (17:21 +0300)
committer	Leif Åstrand <leif@vaadin.com>
	Fri, 18 Oct 2013 14:21:31 +0000 (17:21 +0300)
		1	2
server/src/com/vaadin/server/VaadinService.java	patch \|	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/server/VaadinSession.java	patch \|	diff1 \|	diff2 \|	blob \| history
server/src/com/vaadin/ui/UI.java	patch \|	diff1 \|	diff2 \|	blob \| history