Merge branch 'master' into sqlmigrate
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 18 Feb 2012 16:01:47 +0000 (10:01 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 18 Feb 2012 16:01:47 +0000 (10:01 -0600)
commit63352aaf70d97a37b6277fab0f9b957d34dcb9df
treeacdedffc204d89f1f71f09696270e5719f5e3123
parent7f3ec607a34e727324397c2bf240f771b12a0455
parentfeba5c5287a7cb4c0ed8f5124ad60a8a291770ad
Merge branch 'master' into sqlmigrate

Conflicts:
mediagoblin/db/sql/models.py
mediagoblin/db/sql/models.py