From: Ian Weller <ian@ianweller.org>
Date: Mon, 31 Jan 2011 23:04:29 +0000 (-0700)
Subject: Merge git://github.com/esby/mw
X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/e20392dd7415616f40ec65b4b5e2f9a2dc6efe4d?ds=sidebyside

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

Conflicts:
	src/mw/clicommands.py
---

e20392dd7415616f40ec65b4b5e2f9a2dc6efe4d
diff --cc src/mw/clicommands.py
index 73322bc,eaadb7c..9efffd4
--- a/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):