Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 3 Aug 2011 23:01:17 +0000 (18:01 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 3 Aug 2011 23:01:17 +0000 (18:01 -0500)
commite69bb23b4c3352cd119f9a513ea0e12a123a9d15
tree5c9576f6b5ceb3e823756d49f53c60e6dccf830e
parent5bb1f9b0efdfa801dfdf083184e5820fb29e00b0
parent4d74812dfc5a671aa50f54951ffe9e0ee520f8f7
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin