Merge remote branch 'maemo/master'
[someplayer] / .gitignore
1 someplayer.pro.user