formatting
merged changes
merged conflicts
Merge branch '7.x' of github.com:discoverygarden/islandora_critical_edition into 7.x
changed labels
Merge pull request #47 from ajstanley/7.x

Labels