discoverygarden/islandora_accordion_rotator_module — pull request #5 by MorganDawe (2013-04-29 18:29:18+00:00)
Title: Updated merge conflict issues

Updated merge conflict issues