Merge remote-tracking branch 'refs/remotes/tsyesika/master'
[mediagoblin.git] / docs / source / plugindocs / flatpagesfile.rst
2012-07-16 Will Kahn-GreeneFinish flatpagesplugin; add plugin docs