Merge branch 'master' into userinfo
[situare] / res / images / zoom_out.png
res/images/zoom_out.png