Merge branch 'ma/simplify-merge-config-parsing'
[git] / po / .gitignore
1 /build