Merge remote-tracking branch 'refs/remotes/rodney757/dbupdate'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 2 Jan 2014 21:01:54 +0000 (15:01 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 2 Jan 2014 21:01:54 +0000 (15:01 -0600)
commite0bf6b4bf79fbe5e5c13fce2d91a5a4292b80e16
tree24206ac14e260404243057351fc6c156e5870bb6
parent408aa9cf3b29d778eb7594e4de1720a6bb158024
parent635dd6cc31d4d9afbe648f76af2f799eebf8f1f1
Merge remote-tracking branch 'refs/remotes/rodney757/dbupdate'

Conflicts:
mediagoblin/db/util.py
mediagoblin/gmg_commands/dbupdate.py
mediagoblin/gmg_commands/dbupdate.py