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-07-31 13:58:36 +02:00
2014-06-23 12:33:10 +02:00
2014-08-27 22:51:27 -04:00
2014-08-24 22:31:37 +02:00
2014-08-22 11:57:40 +02:00
2014-02-05 19:18:33 +01:00
2014-02-03 18:32:21 -05:00
2014-08-29 01:14:10 +04:00
2014-08-11 13:58:40 +02:00
2014-08-20 02:03:18 -05:00
2014-08-24 22:31:37 +02:00
2014-08-29 11:45:22 +02:00
2014-02-02 21:36:22 +04:00
2014-08-19 23:47:58 +02:00
2014-08-24 18:52:50 +02:00
2014-06-01 15:15:15 +02:00
2014-07-21 12:05:57 +02:00
2014-08-24 22:31:37 +02:00
2014-07-31 13:57:45 +02:00
2014-08-24 22:31:37 +02:00
2014-08-20 01:43:31 -05:00
2014-08-24 16:02:57 +02:00
2014-08-02 05:08:07 +02:00
2014-01-30 21:56:17 -06:00
2014-08-24 22:31:37 +02:00
2014-04-19 14:30:39 +01:00
2014-05-27 20:08:50 +02:00
2014-06-24 16:10:13 -05:00
2014-08-24 22:31:37 +02:00
2014-08-23 15:17:06 +02:00
2014-08-24 22:31:37 +02:00
2014-08-24 22:31:37 +02:00
2014-08-24 18:52:50 +02:00
2014-08-24 22:31:37 +02:00
2014-04-13 19:46:00 +02:00
2014-07-22 11:01:32 +02:00
2014-08-24 22:31:37 +02:00
2014-04-19 23:21:51 +08:00
2014-05-21 15:50:15 +10:00