Merge branch 'master' into id
[pithos] / pithos / settings.d / 30-ui.conf
2011-11-25 Antony ChazapisUpdate default settings.