Merge branch 'master' into root-cleanup

Conflicts:
	server/src/com/vaadin/terminal/DeploymentConfiguration.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java

1 files changed, 0 insertions, 23 deletions

diff --git a/src/com/vaadin/shared/communication/ClientRpc.java b/src/com/vaadin/shared/communication/ClientRpc.java
deleted file mode 100644
index d49bc05260..0000000000
--- a/src/com/vaadin/shared/communication/ClientRpc.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-@VaadinApache2LicenseForJavaFiles@
- */
-
-package com.vaadin.shared.communication;
-
-import java.io.Serializable;
-
-/**
- * Interface to be extended by all server to client RPC interfaces.
- * 
- * On the server side, proxies of the interface can be obtained from
- * AbstractComponent. On the client, RPC implementations can be registered with
- * AbstractConnector.registerRpc().
- * 
- * Note: Currently, each RPC interface may not contain multiple methods with the
- * same name, even if their parameter lists would differ.
- * 
- * @since 7.0
- */
-public interface ClientRpc extends Serializable {
-
-}