Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Sat, 30 Nov 2013 19:31:23 +0000 (11:31 -0800)
committerW. Trevor King <wking@tremily.us>
Sat, 30 Nov 2013 19:31:23 +0000 (11:31 -0800)
commit1fc169e5aee0782925bb2bfbbd193af9fd2c3f83
tree764ab78bcf2f438cd7a88fd340fc658fc1f0d424
parent3b5f6de24fe9c60f6292d43185abb0e97f731204
parent45dd7e25f82d47066740412a38d912805227d207
Merge branch 'master' into namespaced

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