Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
authorAditi Mittal <aditi.iitr@gmail.com>
Wed, 18 Sep 2013 16:53:36 +0000 (22:23 +0530)
committerAditi Mittal <aditi.iitr@gmail.com>
Wed, 18 Sep 2013 16:53:36 +0000 (22:23 +0530)
1  2 
mediagoblin/user_pages/views.py

Simple merge