Merge remote branch 'upstream/master'
authorElrond <elrond+mediagoblin.org@samba-tng.org>
Thu, 2 Jun 2011 12:33:26 +0000 (14:33 +0200)
committerElrond <elrond+mediagoblin.org@samba-tng.org>
Thu, 2 Jun 2011 12:41:50 +0000 (14:41 +0200)
commit7fd6f623f1cb558360c940a6dd1dc6c1e74fe31b
tree89c29354c416cbcbf2eb0827e61c7084a80fdf22
parentc849e690925cb656b8c00ccbeda12aeab22c2fdd
parent4d4b49a84e2791da6b12ef580565251c379264b6
Merge remote branch 'upstream/master'

Conflicts:
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/decorators.py
mediagoblin/templates/mediagoblin/user_pages/media.html