Merge remote-tracking branch 'refs/remotes/rodney757/file_limits'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 18 Sep 2013 16:21:57 +0000 (11:21 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 18 Sep 2013 16:21:57 +0000 (11:21 -0500)
commit28eab59acef05b5f38052941483f900d2e78c50b
tree67cfcdc247bdd856cd72798ee2492bdbafd31e47
parent81e536e1a27626d5386b917cb1405eb1585e4f10
parent0b95003cd4055745494cf10c89ccbfa6ac04c0e4
Merge remote-tracking branch 'refs/remotes/rodney757/file_limits'

Conflicts:
mediagoblin/db/migrations.py
mediagoblin/config_spec.ini
mediagoblin/db/migrations.py
mediagoblin/db/models.py