Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Sat, 7 May 2011 11:46:30 +0000 (13:46 +0200)
committerJoar Wandborg <git@wandborg.com>
Sat, 7 May 2011 11:46:30 +0000 (13:46 +0200)
commit801df16215b424f2bc5357fd15dccccee6c3dec6
treef8c386e0d278504ee791f1fd3d936e89d41072bb
parent88bcdcd7d28d8e5548aeefa0a69e8af3773870a9
parent52be418afe95f7a127b12b559867921578d16dee
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin