Merge remote-tracking branch 'origin/master'
[fw/altos] / altosui / altos.desktop.in
2014-02-16 Keith PackardMove .desktop and icon management out of debian dir