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
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x
remove comment
docs update for array of mime types
spelling
cs fixes
Changed submenu name
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
fixed path
fixed path
fixed path
Merge pull request #483 from ajstanley/7.x

Changed submenu name
Use drupal_random_bytes just to be careful.
Merge pull request #486 from jordandukart/7.x-random-bytes

Use drupal_random_bytes just to be careful.
Merge pull request #457 from nhart/7.x

allow multiple mime types when getting list of viewers for solution packs