Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Thu, 31 Oct 2013 02:50:38 +0000 (19:50 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 31 Oct 2013 02:50:38 +0000 (19:50 -0700)
commit8e8ca6e813d05d8eee47667d735a37d21136d3d4
tree7dc16bd9545003a8f4983af9b7befd307876cdf9
parent708d76bf7cd48cfe5d943e302c07d6676b75210a
parentd55c6bdf05db224669874a9faf2bde837898db88
Merge branch 'master' into namespaced

* master:
  swc-windows-installer.py: Restore nose entry point
setup/windows-installer/swc-windows-installer.py