Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 9 Aug 2011 03:27:51 +0000 (22:27 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 9 Aug 2011 03:27:51 +0000 (22:27 -0500)
commitdf236d15c18687986786f09f33fedddfb63d5d13
tree683c62cdc8371d786f7f718c1054b5726862f8fb
parent956ba354c9c79384250e85ad4d9f16900503921b
parent1bcf30faa9af876d1a2ccd442d7a96d39582d0f9
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin