From: W. Trevor King <wking@tremily.us>
Date: Mon, 13 Jan 2014 22:09:37 +0000 (-0800)
Subject: Merge branch 'master' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3963a8d8be435d5e6195caa7717516b972484eca;p=swc-workshop.git

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
---

3963a8d8be435d5e6195caa7717516b972484eca
diff --cc setup/windows-installer/swc-windows-installer.sh
index 0000000,8fc15f1..8fc15f1
mode 000000,100755..100755
--- a/setup/windows-installer/swc-windows-installer.sh
+++ b/setup/windows-installer/swc-windows-installer.sh