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)
commit0c658fa07c706200da979d0b0131cb1250010ce2
treea223e8d8826e3e49c52063dedc3b6a89fcc4e169
parent1d0be81ac31542fede855d5014eaf3af107db090
parent33c818fb2f8b68da45e0bb177d615e99cbbcf707
Merge remote-tracking branch 'refs/remotes/gregor/gregoa'

* don't clobber .mrconfig
* fix whitespace
* add ls-remotes command