Merge branch 'master' of git://gitorious.org/~schendje/mediagoblin/schendjes-mediagoblin
authorJoar Wandborg <git@wandborg.com>
Sat, 28 May 2011 21:52:00 +0000 (23:52 +0200)
committerJoar Wandborg <git@wandborg.com>
Sat, 28 May 2011 21:52:00 +0000 (23:52 +0200)
commita78c8af8a618ad093b7ce0031825a8f5c56c8f33
treeb230b787c715d4ad6f662eab14e407babcc42e9e
parent491dd3ff47826b419764f6379474dcb859e6dcb1
parentb5cc7afea210cb1fc2e607f75d4922136ba4ecb5
Merge branch 'master' of git://gitorious.org/~schendje/mediagoblin/schendjes-mediagoblin
mediagoblin/templates/mediagoblin/base.html