pulibrary/rbsc_drupal_exhibit — pull request #5 by kevinreiss (2014-02-24 18:10:20+00:00)
Title: Resolve merge conflict subcase style enhancements

Allows auto-merge after a manually local merge. Going to give it a go. I'm not sure why automerge did not work on github. Didn't get a conflict warning when I merged locally.