raeeschachar/edx-platform — pull request #1 by jzoldak (2014-03-17 18:16:35+00:00)
Title: Rebased bok-choy version update onto current master

@raeeschachar - I squashed and rebased your and ammar's changes onto current master.