jordanlgraham/altitude — pull request #2 by jordanlgraham (2013-02-23 18:24:01+00:00)
Title: Resolved conflict

Merge changes that resolved the conflict between superfish and views_slideshow