Merge branch 'master' into bc-namespaced
authorW. Trevor King <wking@tremily.us>
Sat, 30 Nov 2013 19:31:46 +0000 (11:31 -0800)
committerW. Trevor King <wking@tremily.us>
Sat, 30 Nov 2013 19:31:46 +0000 (11:31 -0800)
commit655bea2ba031613e0be17e2e66db72e647f1aafe
tree4cf3a8ac38245437346b3a5a337fa4a1dfa10c12
parent0029b82f0de703149db622c724227e257d3ca0f4
parent45dd7e25f82d47066740412a38d912805227d207
Merge branch 'master' into bc-namespaced

* master:
  swc-installation-test-2.py: Prefer pip to easy_install
setup/swc-installation-test-2.py