Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorlora <lorochka85@gmail.com>
Sat, 19 Nov 2011 23:01:40 +0000 (17:01 -0600)
committerlora <lorochka85@gmail.com>
Sat, 19 Nov 2011 23:01:40 +0000 (17:01 -0600)
commit707001950a42c7adfd6657f227a2c2dbbd09afce
tree9a7215448098b8681b2b45fe636eb8af6c3ea8ba
parent2d62e9efd210becd30982e65e06a6ef97029b391
parentaea6d577cbf4d937427dea173f74fb17ad45bd75
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
mediagoblin/decorators.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html