Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Wed, 4 May 2011 20:31:08 +0000 (22:31 +0200)
committerJoar Wandborg <git@wandborg.com>
Wed, 4 May 2011 20:31:08 +0000 (22:31 +0200)
commiteee2c3a7e699da493ed9b5c11d0c5873441a7abb
tree2f4c318d1a2e20f38a2ac8e4458ed30c7c82c217
parent7b3fcddbf4fd6418aceb9e0d06b912a0d79c4a97
parent61ec968b0d1a3681bbc049d651f67100b64e1f6d
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin