Merged 1.0.5

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java
	build/shared/revisions.txt
	hardware/arduino/avr/cores/arduino/malloc.c
	hardware/arduino/cores/arduino/avr-libc/malloc.c
	hardware/arduino/cores/arduino/malloc.c
	todo.txt

1 files changed, 1 insertions, 1 deletions

diff --git a/firmwares/wifishield/wifiHD/src/console.c b/firmwares/wifishield/wifiHD/src/console.c
index 5ead91e..e54943f 100644
--- a/firmwares/wifishield/wifiHD/src/console.c
+++ b/firmwares/wifishield/wifiHD/src/console.c
@@ -35,7 +35,7 @@
 #include <board_init.h>
 #include <usart.h>
 
-#define MAX_CMD_CONSOLE_NUM 12
+#define MAX_CMD_CONSOLE_NUM 15
 struct {
         cmd_cb_t cb;
         const char* str;