edx/edx-platform — pull request #1978 by auraz (2013-12-17 16:54:17+00:00)
Title: Alex/lti fixes to release

Add fixes for BLD-561 and BLD-564