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

build/shared/examples/05.Control/Arrays/Arrays.ino

@@ -27,7 +27,6 @@ int ledPins[] = {
 int pinCount = 6;           // the number of pins (i.e. the length of the array)
 
 void setup() {
-  int thisPin;
   // the array elements are numbered from 0 to (pinCount - 1).
   // use a for loop to initialize each pin as an output:
   for (int thisPin = 0; thisPin < pinCount; thisPin++)  {

build/shared/revisions.txt

@@ -96,7 +96,23 @@ ARDUINO 1.5 BETA - 2012.10.22
 * For more info refer to this press release:
   http://arduino.cc/blog/2012/10/22/arduino-1-5-support-for-the-due-and-other-processors-easier-library-installation-simplified-board-menu-etc/
 
-ARDUINO 1.0.4 - Not yet released.
+ARDUINO 1.0.5 - 2013.03.29
+
+[core]
+
+* [avr] malloc bug: backported avr-libc 1.8.0 implementation
+* [avr] removed deprecated interrupt handlers causing compiler issues 
+  with newer avr-gcc.
+
+[libraries]
+
+* Upgrades to WiFi library
+
+[firmwares]
+
+* Upgrades to WiFi firmwares
+
+ARDUINO 1.0.4 - 2013.03.11
 
 [core]
 
@@ -107,6 +123,7 @@ ARDUINO 1.0.4 - Not yet released.
 * Fixed memory leak when calling Ethernet.begin() multiple times.
 * Fixed SD example listfiles.ino
 * Fixed a lot of Esplora examples
+* Added GSM library
 
 [environment]
 
@@ -115,6 +132,11 @@ ARDUINO 1.0.4 - Not yet released.
 * Fixed NPE due to permissions IO error
 * Updated drivers for Windows (all-in-one, signature for Win8)
 
+[bootloaders]
+
+* Fixed a bunch of bugs on Mega2560's bootloader (Mark Sproul)
+  (https://github.com/arduino/Arduino/pull/1183)
+
 ARDUINO 1.0.3 - 2012.12.10
 
 [hardware]

build/shared/tools/howto.txt

@@ -71,9 +71,9 @@ regarding the usefulness of including (by default) a Tool that mangles code.)
 
 The folder should be called Mangler (note the capitalization), and contain:
 
-sketchbook/Mangler -> tool folder
-sketchbook/Mangler/tool -> location for code
-sketchbook/Mangler/tool/mangle.jar -> jar with one or more classes
+sketchbook/tools/Mangler -> tool folder
+sketchbook/tools/Mangler/tool -> location for code
+sketchbook/tools/Mangler/tool/mangle.jar -> jar with one or more classes
 
 The naming of jar and zip files in the tool/* directory doesn't matter.