Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
config-examples	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
manual	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00