Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Thu, 13 Mar 2014 00:11:17 +0000 (17:11 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 13 Mar 2014 00:11:17 +0000 (17:11 -0700)
commit5a3d7b2e6ad3c78d30acca158596a71bcfdb4548
tree85912c73b7d9e85121ea734166373ea45a910faa
parent4bb7b5ce1795052acbf704200e85f5f0a455e400
parent7bd5609417b5d0d90ec091759638dd69c2336a81
Merge branch 'master' into namespaced

* master:
  swc-windows-installer.sh: Use '~' in ~/nano.rc includes
  swc-windows-installer.sh: Rename ~/.nanorc to ~/nano.rc
setup/windows-installer/swc-windows-installer.sh