Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Fri, 1 Jul 2011 20:02:58 +0000 (22:02 +0200)
committerJoar Wandborg <git@wandborg.com>
Fri, 1 Jul 2011 20:02:58 +0000 (22:02 +0200)
commitfe5f8a281a3cd5d2e449866caaa410b06e488588
tree5adc956eeaae6b86fa36100b710ca361d6fe4da4
parent40d18ad4c6d66d6db1aaf43df8d6ba23d162f77f
parent0e3400357d55caf9099f4288ce8aef90eff7867c
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin