Merge branch 'master' of ssh://mjb@git.ethernal.org/~/git/altos
[fw/altos] / altosdroid / .settings /
2012-06-03 Keith Packardaltosdroid: import code from mjb