Vladimír Čunát 30f31c9afc Merge 'master' into staging ... (relatively simple conflicts)		2015-04-26 22:52:08 +02: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 'master' into staging	2015-04-26 22:52:08 +02:00