From: W. Trevor King <wking@tremily.us>
Date: Thu, 13 Mar 2014 00:11:17 +0000 (-0700)
Subject: Merge branch 'master' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a3d7b2e6ad3c78d30acca158596a71bcfdb4548;p=swc-workshop.git

Merge branch 'master' into namespaced

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

5a3d7b2e6ad3c78d30acca158596a71bcfdb4548