Merge remote branch 'upstream/master'
authorreagle <joseph.2008@reagle.org>
Wed, 2 Feb 2011 22:19:15 +0000 (17:19 -0500)
committerreagle <joseph.2008@reagle.org>
Wed, 2 Feb 2011 22:19:15 +0000 (17:19 -0500)
Conflicts:
src/mw/clicommands.py

1  2 
src/mw/clicommands.py

Simple merge

Benjamin Mako Hill || Want to submit a patch?