Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin into f298_create...
authorJoar Wandborg <git@wandborg.com>
Mon, 8 Aug 2011 01:48:27 +0000 (03:48 +0200)
committerJoar Wandborg <git@wandborg.com>
Mon, 8 Aug 2011 01:48:27 +0000 (03:48 +0200)
commit537afbb6db849b5efcff9cf9b824ce464f8e129d
tree45c908ce4e09e15ae5a0ebedd5df60d229554571
parent9188f3afe24a52fff3262360a0896cc521546fa8
parent3965f0f5fae2fdd3d1242a31806f8fe305d69273
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin into f298_create_envball