Merge branch 'release-0.4.1'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 10 Jul 2013 22:40:57 +0000 (17:40 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 10 Jul 2013 22:40:57 +0000 (17:40 -0500)
commit2ae78574b3eb8c393136e7ebbc922d33bf6482f2
tree3c7bccb010600319c5f34ddf41aa31620de8e951
parent5622cc44edfb2d653ae67946fa9ea130c5f7fcaa
parentd3b1fd2e606f549c5ecc2a31c94d90aa93794005
Merge branch 'release-0.4.1'

Conflicts:
mediagoblin/_version.py
docs/source/siteadmin/relnotes.rst
mediagoblin/_version.py
setup.py