Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 12 Mar 2012 23:38:35 +0000 (18:38 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 12 Mar 2012 23:38:35 +0000 (18:38 -0500)
commit849cf91fc8feeed308b5f54fd53d1940bf23058b
treeb7fdd37c737d5e649c04eec3a0b12259846a4177
parent1f36e6bee969fff96bb925673c045983618b60d0
parentcc9f9a1dd3e8f3d0aa642e2a987a9d075e59d3d8
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin