Merge remote-tracking branch 'refs/remotes/gregor/gregoa'
authorMike O'Connor <stew@vireo.org>
Sat, 8 Oct 2011 18:17:06 +0000 (14:17 -0400)
committerMike O'Connor <stew@vireo.org>
Sat, 8 Oct 2011 18:17:06 +0000 (14:17 -0400)
* don't clobber .mrconfig
* fix whitespace
* add ls-remotes command


Trivial merge