Merge branch 'master' of git.rot13.org:/git/Arduino
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 11 Jan 2015 15:54:11 +0000 (16:54 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 11 Jan 2015 15:54:11 +0000 (16:54 +0100)

Trivial merge