William A. Kennington III 00df204c82 Merge remote-tracking branch 'upstream/master' into staging		2015-05-01 15:57:09 -07:00
..
7.15.nix	Merge branch 'curl-ssl-cert-file' of https://github.com/the-kenny/nixpkgs into staging	2014-11-27 13:29:50 +01:00
default.nix	Merge remote-tracking branch 'upstream/master' into staging	2015-05-01 15:57:09 -07:00