Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Fri, 6 May 2011 08:37:08 +0000 (10:37 +0200)
committerJoar Wandborg <git@wandborg.com>
Fri, 6 May 2011 08:37:08 +0000 (10:37 +0200)
commite19bd50a7b1bc0232ddb5afbebd06abaf1da537f
tree91d7d1ac67e2547cfc7a23365addc5fb35e563d2
parenteee2c3a7e699da493ed9b5c11d0c5873441a7abb
parent1b9e2541b9e8c4449f8f78dc91c8caa7b92c7aa5
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin