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)
* master:
  swc-installation-test-2.py: Prefer pip to easy_install

1  2 
setup/swc-installation-test-2.py

Simple merge