Merge git://github.com/esby/mw

Conflicts:
	src/mw/clicommands.py

diff --cc src/mw/clicommands.py
index 73322bc857a23ee8d2bab3bba70d4a2029922a53,eaadb7ce2960ff9c2e77bf94817426215e5d9508..9efffd4a2883a68476d1723befe4f446170b81b3
--- 1/src/mw/clicommands.py
--- 2/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@@ -23,8 -22,9 +23,9 @@@ import hashli
  import mw.metadir
  from optparse import OptionParser, OptionGroup
  import os
 +import simplemediawiki
  import sys
+ import time
  
  
  class CommandBase(object):