Merge remote branch 'origin/xorg/1.0.2/master' into xorg/master
[platal.git] / configs / .gitignore
1 platal.conf
2 platal.cron
3 ax_xorg_rsa.pem
4 *.pem