Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi <aditi.iitr@gmail.com>
Fri, 9 Aug 2013 11:08:55 +0000 (16:38 +0530)
committerAditi <aditi.iitr@gmail.com>
Fri, 9 Aug 2013 11:08:55 +0000 (16:38 +0530)
1  2 
mediagoblin/user_pages/views.py

Simple merge