Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin...
authorRodney Ewing <ewing.rj@gmail.com>
Wed, 31 Jul 2013 22:27:22 +0000 (15:27 -0700)
committerRodney Ewing <ewing.rj@gmail.com>
Wed, 31 Jul 2013 22:27:22 +0000 (15:27 -0700)
commit2119ee3b90446264db48f5259d8cce30e397dee3
tree8d0c231ab2fac0c98b1b7848ce8e0ecda20292c9
parent9b60486894e437b90592ec5354f76d7c40ffd6b6
parent5058cd51000a5ed3093816b6f786aed7126a15ba
Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin into 55

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