Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Sat, 7 May 2011 16:07:04 +0000 (18:07 +0200)
committerJoar Wandborg <git@wandborg.com>
Sat, 7 May 2011 16:07:04 +0000 (18:07 +0200)
commita083786dcfc8499384ae600bf4f2c68a5d5639bf
tree4ffe3079c81c81bfb05b12c136d1022241271873
parent801df16215b424f2bc5357fd15dccccee6c3dec6
parent27057b42fb68e3f640a1788d6de36649af6455f7
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin