edx/edx-platform — pull request #6089 by chrisndodge (2014-11-29 16:24:13+00:00)
Title: fix broken master regarding pep8 number of blank lines

@sarina seems like master is failing pep8 now. Here are the fixes. The problem was that the PR passed code quality tests on the diffs.