ets-berkeley-edu/calcentral — pull request #1627 by ctweney (2013-10-01 15:55:16+00:00)
Title: CLC-2609 (QA) Tele-BEARS semester rollover (fixed merge conflicts)

Fixed the merge conflicts that were present in #1624

https://jira.media.berkeley.edu/jira/browse/CLC-2609