Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 4 Nov 2011 13:23:48 +0000 (08:23 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 4 Nov 2011 13:23:48 +0000 (08:23 -0500)
commit76dd312ff5618e6dcb4b8f8796648180acae5953
tree74db3639039d7ef38ca3ee3ff78a5b9195278ae7
parentd871f4e0d107268fab9dc33c648b1a6f7a99a652
parentda76a8cbaa06ba63533f60051c66f08cd0e7baf4
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin