Merge branch 'master' into branch-1.6
[fw/altos] / doc / ignitor.png
2014-06-12 Keith Packarddoc: Update altusmetrum docs and screen shots for 1.4