Merge branch 'master' into sqlmigrate
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 18 Feb 2012 21:33:29 +0000 (15:33 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 18 Feb 2012 21:33:29 +0000 (15:33 -0600)
commit4d8be4fe0d82c13c0a4d0fb454c422449bdfafe2
treeb9be37aef8bb0284f011fe56e0c6d02cf404aba7
parent63352aaf70d97a37b6277fab0f9b957d34dcb9df
parenta45631e3f3791071571da3a59bf6d3ecad42033f
Merge branch 'master' into sqlmigrate
mediagoblin/db/sql/models.py