Merge branch 'master' into paz-927
[pazpar2-moved-to-github.git] / etc / settings / opencontent.xml
2009-09-25 Adam DickmeissSetting files moved to etc/settings.