Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
[mediagoblin.git] / docs / source / plugindocs / flatpagesfile.rst
2013-06-21 AditiMerge remote-tracking branch 'cweb/master'
2012-07-16 Will Kahn-GreeneFinish flatpagesplugin; add plugin docs