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)
commit81d3c4cf1cee923c4b803a96b6f5628e9aa9b78d
tree0361e85a142b3574b0de28f172fdcf57f21bb6ee
parent9c7688667e9a5e96fbf54900976834b4ecf2b033
parenta122357ee75d0abf215b552f0923de1fd722f6de
Merge branch 'master' into 201207-testfixes
mediagoblin/user_pages/views.py