Bump year to 2015
[pazpar2-moved-to-github.git] / test / test_http_83.res
2012-12-14 Adam DickmeissAllow merge on merged content