Merge remote-tracking branch 'origin/master' into stm-flash
authorKeith Packard <keithp@keithp.com>
Fri, 3 May 2013 06:17:17 +0000 (23:17 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 3 May 2013 06:17:17 +0000 (23:17 -0700)
commitd6900a5d1fc24f007fc479eb528b199dd195e1eb
treee6207fa4ee032a6b04f876f5dca43ad5b301d02f
parent39dcd19ded04175a074c9541c5e1752bac3eda8c
parent1629acba4a63baae2c687ed56a17d02faf45f5e5
Merge remote-tracking branch 'origin/master' into stm-flash

Conflicts:
altosdroid/Notebook
altosdroid/Notebook