From: reagle <joseph.2008@reagle.org>
Date: Wed, 2 Feb 2011 22:19:15 +0000 (-0500)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/993ca0c147e9801768f7e5aa3f21c8f22fe0e897

Merge remote branch 'upstream/master'

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

993ca0c147e9801768f7e5aa3f21c8f22fe0e897