Merge remote-tracking branch 'origin/master'
[fw/altos] / micropeak / micropeak.desktop.in
2014-02-16 Keith Packardmicropeak: Construct linux install script