adviti/mediagoblin_blog — pull request #1 by spaetz (2013-08-29 10:12:24+00:00)
Title: Fix remainders from merging

A few merging conflict lines accidentally entered the code. Removing.