Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 17 Jan 2013 21:51:30 +0000 (15:51 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 17 Jan 2013 21:51:30 +0000 (15:51 -0600)
commit00cf28da215e73c494f553e7de3d21a9b63cf0cf
tree461ee702dca35ea6ffe56380286c24abe3bd155f
parentc813f0bd5776dde0e3c42c12b17f83f211b50e6a
parentba5ea989a5826440e8b84af8128dadd0ae252259
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin