Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin...

Conflicts:
	docs/source/siteadmin/relnotes.rst

diff --cc docs/source/siteadmin/relnotes.rst
index 35415b66d0a54197b07f876d0a455e45844f5735,f0be8ecbfde79161f23dac651d6928d82cc3be8e..72fcb3d460407a09664b749d33148bf29eae205f
--- 1/docs/source/siteadmin/relnotes.rst
--- 2/docs/source/siteadmin/relnotes.rst
+++ b/docs/source/siteadmin/relnotes.rst
@@@ -104,12 -26,10 +104,12 @@@ please note the following
  
  1. Make sure to run ``bin/gmg dbupdate`` after upgrading.
  2. OpenStreetMap is now a plugin, so if you want to use it, add the
 -   following to your config file::
 +   following to your config file:
 +
 +   .. code-block:: ini
  
-       [plugins]
-       [[mediagoblin.plugins.geolocation]]
+     [plugins]
+     [[mediagoblin.plugins.geolocation]]
  
  If you have your own theme, you may need to make some adjustments to
  it as some theme related things may have changed in this release.  If