Vladimír Čunát
e51f73652d
Merge recent master into staging
Hydra: ?compare=1149952
Conflicts:
nixos/doc/manual/configuration.xml (changed split file)
nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
..
2014-05-14 22:40:09 +02:00
2014-08-21 07:08:09 -03:00
2014-08-24 17:30:50 +02:00
2014-08-27 13:26:00 +02:00
2014-02-03 18:32:21 -05:00
2014-08-13 23:26:26 +02:00
2014-08-30 10:04:02 +02:00
2014-05-14 22:24:01 +02:00
2014-08-27 21:24:13 +02:00
2014-08-28 21:27:08 +02:00
2014-08-08 17:59:02 +02:00