Eelco Dolstra 90c462a222 Merge remote-tracking branch 'origin/master' into build-ng ... Conflicts: hydra-module.nix		2015-08-04 14:30:22 +02:00
..
Hydra	Merge remote-tracking branch 'origin/master' into build-ng	2015-08-04 14:30:22 +02:00
Hydra.pm	Unify Hydra's NixOS module with the one used for hydra.nixos.org	2015-07-02 01:01:44 +02:00
Makefile.am	Merge in the first bits of the API work	2013-07-02 14:00:46 -04:00