Updated the dc compostie xml file
Buildfile and doxyfile
Merge pull request #38 from daniel-dgi/7.x

Buildfile and doxyfile
Sed fix
Merge pull request #39 from daniel-dgi/7.x

Sed fix
Merge pull request #37 from philsogaDGI/7.x

Updated the dc compostie xml file
Removed an incorrectly labeled argument.
Merge pull request #41 from nigelgbanks/7.x-removed-changed-argument

Removed an incorrectly labeled argument.
solve blackout per https://groups.google.com/d/msg/islandora/ztY0Iv5-0AU/B3rkrBEl8K8J
Merge pull request #42 from ruebot/7.x

solve blackout per https://groups.google.com/d/msg/islandora/ztY0Iv5-0AU...
Merge remote branch 'upstream/7.x' into flvc