William A. Kennington III 5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream ... This is a partial commit from staging in an attempt to make merges smaller.		2015-09-23 14:35:36 -07:00
..
2.x.nix
3.x.nix	Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream	2015-09-23 14:35:36 -07:00