From: Rodney Ewing <ewing.rj@gmail.com>
Date: Wed, 31 Jul 2013 22:27:22 +0000 (-0700)
Subject: Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2119ee3b90446264db48f5259d8cce30e397dee3;p=mediagoblin.git

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

Conflicts:
	docs/source/siteadmin/relnotes.rst
---

2119ee3b90446264db48f5259d8cce30e397dee3
diff --cc docs/source/siteadmin/relnotes.rst
index 35415b66,f0be8ecb..72fcb3d4
--- a/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