]> projects.mako.cc - mw/commitdiff
Merge git://github.com/esby/mw
authorIan Weller <ian@ianweller.org>
Mon, 31 Jan 2011 23:04:29 +0000 (16:04 -0700)
committerIan Weller <ian@ianweller.org>
Mon, 31 Jan 2011 23:04:29 +0000 (16:04 -0700)
Conflicts:
src/mw/clicommands.py

1  2 
src/mw/clicommands.py

index 73322bc857a23ee8d2bab3bba70d4a2029922a53,eaadb7ce2960ff9c2e77bf94817426215e5d9508..9efffd4a2883a68476d1723befe4f446170b81b3
@@@ -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):

Benjamin Mako Hill || Want to submit a patch?