Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 10 May 2013 16:26:55 +0000 (11:26 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 10 May 2013 16:26:55 +0000 (11:26 -0500)
commit0dfa20c984c9e60b02ea9d68db179109028cbe2b
tree6ed440f0582bb132aa0c765e833145c85a2afb8c
parentfcfcd1f8a3712cfd58889234b7fd40a45c831161
parentf035ec3db4c67e4a4d03d78dccd57ea82b9a6a5d
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin