Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 3 Jun 2012 04:12:45 +0000 (23:12 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 3 Jun 2012 04:12:45 +0000 (23:12 -0500)
commit349f5b19f768f4880b544732c77991ef7bdab6c8
tree77cb3c258884180e2a01f7ec0bdfc7981bc26a21
parent791cc619b5a1a5bbbd5b1451399babb38a5e1b74
parent0e60e7e81b58f2ef8ca4bd571bb9544e41e573c8
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin