Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorMike Linksvayer <ml@gondwanaland.com>
Thu, 20 Dec 2012 20:50:43 +0000 (12:50 -0800)
committerMike Linksvayer <ml@gondwanaland.com>
Thu, 20 Dec 2012 20:50:43 +0000 (12:50 -0800)
commit1d0148aef1493467dacb6c39c4e080ee4a5246d2
tree5213418660d4e079eb8dac6bc8ea2e4fdc140088
parent200433dc38a2139462e0331be36ee49a80a81a12
parent5c99cd01a70f2d597ac7669e8d944ddf79b05281
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

Conflicts:
docs/source/siteadmin/media-types.rst
mediagoblin.ini