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-08-27 23:41:15 +02:00
2014-04-18 00:45:26 +02:00
2014-07-14 21:33:05 +09:00
2014-06-13 17:57:04 +02:00
2014-06-24 21:25:11 +02:00
2014-08-08 17:40:14 +02:00
2014-08-28 11:39:03 -07:00
2014-04-16 16:58:06 +02:00
2014-04-14 16:26:48 +02:00
2014-08-27 23:41:15 +02:00
2014-08-27 23:41:15 +02:00
2014-07-14 21:33:05 +09:00
2014-08-27 23:41:15 +02:00
2014-07-02 12:28:18 -04:00
2014-06-30 09:03:33 +04:00
2014-06-13 17:57:04 +02:00
2014-08-27 22:44:56 +02:00
2014-06-13 17:57:04 +02:00
2014-07-02 12:28:18 -04:00
2014-08-18 17:12:56 +02:00
2014-08-30 10:04:02 +02:00
2014-05-06 20:04:22 +02:00