Fix merge conflict in prev_next.html
[mediagoblin.git] / FOO300
2011-04-02 Christopher Allan... Merge branch 'master' of gitorious.org:mediagoblin...
2011-03-28 Matt LeeAdded catalogue number