Cristian Maglie d4fe0a13b6 Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery ...

Conflicts:
	build/shared/revisions.txt

2013-09-10 12:10:57 +02:00

..

avr

Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

2013-09-10 12:10:57 +02:00

sam

Updated revision log, and upped version to 1.5.4

2013-09-09 19:47:25 +02:00