Merge branch 'python' master v0.2
authorW. Trevor King <wking@tremily.us>
Sat, 18 Oct 2014 18:13:29 +0000 (11:13 -0700)
committerW. Trevor King <wking@tremily.us>
Sat, 18 Oct 2014 18:13:29 +0000 (11:13 -0700)
commit1ba2d19eb8355efc852bd53da530da00eb7cc075
treeed4d4c92c298d670be14a21842caef0a635da834
parent479b79b36478a1ad904e06d3c0404c53f9bd4838
parentec469fab88be3d1bbbc28736ad19aabea73cee01
Merge branch 'python'

Significant changes:
* Bump version to 0.2
* Install GNU Make (cherry-picked from the msysGit repository)
* Mention that R should be installed before running our installer

* python:
  swc-windows-installer.py: Bump version to 0.2
  swc-windows-installer.py: Fix "it's hash" -> "its hash" typo
  swc-windows-installer.py: Add install_msysgit_binary and install Make
  swc-windows-installer.py: Add a trailing paren to get_r_bin_directory.__doc__
  Replace 'Anaconda CE' -> 'Anaconda'
  Mention that R should be installed before running our installer

Conflicts:
README.md (due to different usage instructions between the Python
  branch and the Inno branch).
README.md