Steve Smith 60fcfb1e19 Merge remote-tracking branch 'upstream/master' into install-mac ... Conflicts: docs/getting-started/installation/installing-on-windows/installing-on-windows.rst		2015-04-21 09:41:22 -04:00
..
installing-on-mac	First version ready for edit.	2015-04-20 17:18:54 -04:00
installing-on-windows	Initial version of Mac install article	2015-04-20 16:57:05 -04:00