Merge remote-tracking branch 'origin/master' into is315
authorcfdv <caldavis@gmail.com>
Mon, 20 Jun 2011 17:50:44 +0000 (12:50 -0500)
committercfdv <caldavis@gmail.com>
Mon, 20 Jun 2011 17:50:44 +0000 (12:50 -0500)
commit78c0744077b58fb4c20a965fdbbb52055922d793
tree8ba6033b3f7d8e19c78f59dca2db8ee97872647c
parentcd95cb6d3d6ffa403be5f2b347862929917aa1e3
parent5c441e75ebc4ad63c3a5362d9bc451abe97984d2
Merge remote-tracking branch 'origin/master' into is315
mediagoblin/db/models.py
mediagoblin/edit/views.py