Merge branch 'new-extension' of https://github.com/arduino/Arduino into new-extension

Conflicts:
	build/linux/dist/tools/avrdude.conf

1 files changed, 1 insertions, 1 deletions

diff --git a/cores/arduino/Server.h b/cores/arduino/Server.h
index edab726..9674c76 100644
--- a/cores/arduino/Server.h
+++ b/cores/arduino/Server.h
@@ -1,7 +1,7 @@
 #ifndef server_h
 #define server_h
 
-class Server {
+class Server : public Print {
 public:
   virtual void begin() =0;
 };