Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 21 Jun 2011 21:06:09 +0000 (16:06 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 21 Jun 2011 21:06:09 +0000 (16:06 -0500)
commit26c61fc843f8bd54704d8dbb1e3edd021e100cbd
treeb2b27d3bc5a427c58f5d5e896a4acb36fb89fa51
parentcfd2cbf3dd0c454556524a649204c51f7a6f6a5b
parentf439193628d4ed41f109ca1bdce6bc7ac2287f09
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin