Merge branch 'master' into bc-namespaced
authorW. Trevor King <wking@tremily.us>
Thu, 5 Mar 2015 17:52:24 +0000 (09:52 -0800)
committerW. Trevor King <wking@tremily.us>
Thu, 5 Mar 2015 17:52:24 +0000 (09:52 -0800)
* master:
  Fix decorator in VersionPlistCommandDependency
  swc-installation-test-2.py: Convert PathCommandDependency to VersionPlistCommandDependency
  swc-installation-test-2.py: Add minimum browser requirements for IPython
  swc-installation-test-2.py: Collect classes together
  README.md: Change headers ("Students" -> "For leaners")

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

diff --cc setup/README.md
Simple merge
Simple merge