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)
commite20392dd7415616f40ec65b4b5e2f9a2dc6efe4d
tree11c7654c7cc0983b7cfc764463bbe6765a4c83af
parente89bbd939f4d0a1267a414438769418965329cf0
parent9a2566b262128695551d61f56f0eb3564a2b0fe5
Merge git://github.com/esby/mw

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

Benjamin Mako Hill || Want to submit a patch?