1202 commits

Author	SHA1	Message	Date
Eelco Dolstra	041da5a6f9	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
Eelco Dolstra	5c1f8cbc70	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00