Merge remote-tracking branch 'refs/remotes/rodney757/dbupdate'

Conflicts: mediagoblin/db/util.py mediagoblin/gmg_commands/dbupdate.py
2014-01-02 15:01:54 -06:00
parent 408aa9cf3b 635dd6cc31
commit e0bf6b4bf7
3 changed files with 22 additions and 1 deletions
--- a/mediagoblin/gmg_commands/dbupdate.py
+++ b/mediagoblin/gmg_commands/dbupdate.py
@@ -28,6 +28,7 @@ logging.basicConfig()
 ## Let's not set the level as debug by default to avoid confusing users :)
 # _log.setLevel(logging.DEBUG)

+
 def dbupdate_parse_setup(subparser):
    pass