Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Mon, 13 Jan 2014 22:09:37 +0000 (14:09 -0800)
committerW. Trevor King <wking@tremily.us>
Mon, 13 Jan 2014 22:09:37 +0000 (14:09 -0800)
commit3963a8d8be435d5e6195caa7717516b972484eca
tree185633d3a53d05d5dfc74ad53c84511b3e45b602
parentf2587ec379d7b8df130a295709ab7064ad43f5bd
parenta82ad6c1dffd205ac9ff0e1b26e9b2328a076657
Merge branch 'master' into namespaced

* master:
  swc-windows-installer.sh: Convert script from Python to POSIX shell

Conflicts:
setup/windows-installer/swc-windows-installer.py
setup/windows-installer/swc-windows-installer.sh