Merge branch 'master' into paz-927
[pazpar2-moved-to-github.git] / test / cf_mit_opencourseware_settings.xml
2012-04-24 Dennis SchafrothExtract target settings from test_preferred.urls