Merge branch '7.x-solution-pack-viewer-whitescreen' of https://github.com/nigelgbanks/islandora into 7.x
allow mulitple mime types for viewers
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x
Merge branch '7.x-hookable-metadata' of github.com:jordandukart/islandora into 7.x
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x
Added 'islandora_os_check' function, primarily for Windows detection.
ISLANDORA-450 Instead of PHP_OS, now using php_uname() for OS detection.
ISLANDORA-450 Function renamed, moved to utilities.inc; now returns boolean.
no longer used template removed
better doc
Merge pull request #450 from slangerx/7.x

Windows-compatibility: New function for OS detection
Merge pull request #453 from willtp87/7.x.print_update

no longer used template removed
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x
toggle switch for automatic deletion
travis isn't a fan of my lack of camelCase
Merge pull request #454 from qadan/7.x

toggle switch for automatic deletion
Update islandora.api.php

Added hook_alter for ingest steps.
can now install as well as reinstall
fixed link display on error