Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Wed, 5 Mar 2014 17:44:52 +0000 (09:44 -0800)
committerW. Trevor King <wking@tremily.us>
Wed, 5 Mar 2014 17:44:52 +0000 (09:44 -0800)
commit4bb7b5ce1795052acbf704200e85f5f0a455e400
treea602a780c34ddc0df2ee681a16e133697b4dfa7c
parent3963a8d8be435d5e6195caa7717516b972484eca
parent97cfc2ddf846c2888afd363227ba0abe46099cd8
Merge branch 'master' into namespaced

* master:
  swc-windows-installer.sh: Install nano source syntax highlighters
setup/windows-installer/swc-windows-installer.sh