pyrocms/pyrocms — pull request #824 by kuroi (2011-10-20 21:39:00+00:00)
Title: Deal with merge errors.

Files contained unresolved merge errors. This tidies them up. Only one case with differing text between and the correct version was clear even to a non-Slovenian speaker.