Merge branch '7.x' of github.com:Islandora/islandora into 7.x
ingestConstructedObject function
removed the test for the test?
Merge pull request #1 from Islandora/7.x

update 7.x
Merge branch '7.x' of https://github.com/qadan/islandora into 7.x
some issues in the docs
travis got angry
Merge branch '7.x' of https://github.com/qadan/islandora into 7.x
added specific image assertions
datastream validation
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
Merge pull request #413 from jordandukart/7.x

Extra s on a permission.
Merge pull request #2 from Islandora/7.x

update 7.x
tests can no longer destroy filter_drupal.xml; filter can be repaired
fix conflicts
Merge branch '7.x' of https://github.com/qadan/islandora into 7.x
somehow managed to remove a brace
travis complaints
haha more coding stuff