Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Thu, 30 Jun 2011 09:48:52 +0000 (11:48 +0200)
committerJoar Wandborg <git@wandborg.com>
Thu, 30 Jun 2011 09:48:52 +0000 (11:48 +0200)
commit40d18ad4c6d66d6db1aaf43df8d6ba23d162f77f
treeafcddc7b5224e830c1bc54a329db95e6a00babfc
parent47f524f67d90245521cb6214e269e89f06daeaf2
parent52359e9103e85e153e3012332e59bd64abf83dbc
Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin