kuali/kc — pull request #136 by yyuan1 (2014-04-01 19:09:35+00:00)
Title: 0401 repack propdev 2

Fixed conflict from a merged PR