Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 17 Mar 2012 22:09:26 +0000 (17:09 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 17 Mar 2012 22:09:26 +0000 (17:09 -0500)
commit2011f2d89eebd56a5b141ccedb0968b018459bc1
tree300ae9a0c75fdba3cadcf1438b01ca8b91143603
parent9e55431143e48d0ee923e5b6904f450ccf3ca903
parent327a1bb2794c98127460e74658e03b37acb0efd6
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin