Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 6 May 2011 11:55:20 +0000 (06:55 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 6 May 2011 11:55:20 +0000 (06:55 -0500)
commit30d216aedce6d2b4696f2213c20c77dffae9b477
tree4988263f31e2eb5c12b150f995c5a5dcbc7710e1
parent4509880386a4fc8c0d3d0e7c2176776593af8f02
parent1b9e2541b9e8c4449f8f78dc91c8caa7b92c7aa5
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin