edx/edx-platform — pull request #4834 by dmitchell (2014-08-14 17:34:06+00:00)
Title: Reruns/branch lms

@talbs conflict resolution s/b confirmed on cms/static/sass/views/_dashboard.scss, cms/static/sass/_base.scss