Buildfile and Doxyfile
Merge branch '7.x' of https://github.com/willtp87/islandora into 7.x
Merge pull request #293 from willtp87/7.x

Revived islandora_hooks_test module to get hook tests working
Merge pull request #296 from daniel-dgi/7.x

7.x
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x