Steve Smith 95ffe4da42 Merge remote-tracking branch 'upstream/master' into update-toc		2015-04-28 01:44:39 -04:00
..
style-guide/_static	Moved style guide to follow new file/folder convention	2015-04-28 01:03:27 -04:00
style-guide.rst	Merge remote-tracking branch 'upstream/master' into update-toc	2015-04-28 01:44:39 -04:00