Merge branch 'master' into 201207-testfixes
authorBrett Smith <brettcsmith@brettcsmith.org>
Sun, 8 Jul 2012 15:07:02 +0000 (11:07 -0400)
committerBrett Smith <brettcsmith@brettcsmith.org>
Sun, 8 Jul 2012 15:07:02 +0000 (11:07 -0400)
1  2 
mediagoblin/user_pages/views.py

Simple merge