Oliver Charles 42ae633445 Merge branch 'master' into dbus-switch-to-configuration
Conflicts:
	nixos/modules/system/activation/switch-to-configuration.pl
2014-04-20 19:17:05 +01:00
..
2014-04-19 22:59:25 +02:00
2014-04-17 17:07:03 +02:00
2014-04-19 14:37:05 +02:00
2013-10-28 22:45:58 +01:00
2014-04-19 14:37:05 +02:00
2014-04-19 14:37:05 +02:00

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
http://nixos.org/nixos and in the manual in doc/manual.