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)
commit993ca0c147e9801768f7e5aa3f21c8f22fe0e897
treee7b3fceeaeae72cf5b011a9b21bac30c11e9b792
parent9ef27bc8f58e620ef72264de998a0035321155f0
parent68c68ed8ee4dc61fd44791ec974daa983c604ead
Merge remote branch 'upstream/master'

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

Benjamin Mako Hill || Want to submit a patch?