Jasig/uPortal — pull request #462 by doodelicious (2014-11-11 17:18:43+00:00)
Title: UP-3912: Correct merge issue with this file

Correcting merge issue with listChannels.jsp (this includes the latest file changes)