Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Sun, 12 Jun 2011 12:37:49 +0000 (14:37 +0200)
committerJoar Wandborg <git@wandborg.com>
Sun, 12 Jun 2011 12:37:49 +0000 (14:37 +0200)
commita48014d67a5185c645ac876d365b4cb85cbb6b1f
treedf9a459c0f246f1b189bb338b1b3470d87ff3f02
parent44e2da2fe60a3b8765d0fef5a9ce0c3e5997dd01
parent68ffb13690fa0c364c514ce253364f928e50841c
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin