Merge branch 'master' into branch-1.0
[fw/altos] / icon / altus-metrum-16x16.jpg
icon/altus-metrum-16x16.jpg