Vladimír Čunát d4e9fd2a90 Merge recent master into staging
Hydra: ?compare=1148749

Conflicts (easy):
	nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
..
2014-07-31 13:58:36 +02:00
2014-06-23 12:33:10 +02:00
2014-07-28 17:00:02 +02:00
2014-01-09 13:01:38 +01:00
2014-01-11 19:08:40 +01:00
2013-06-04 11:30:32 +04:00
2014-08-11 13:58:40 +02:00
2014-08-20 02:03:18 -05:00
2014-08-18 17:20:37 +02:00
2014-08-19 23:47:58 +02:00
2014-07-22 11:01:32 +02:00
2014-06-01 15:15:15 +02:00
2014-07-21 12:05:57 +02:00
2014-07-31 13:57:45 +02:00
2014-08-20 01:43:31 -05:00
2014-03-28 18:39:26 +08:00
2014-08-02 05:08:07 +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-06-05 13:04:18 +02:00
2014-06-30 09:37:19 +04:00
2014-04-13 19:46:00 +02:00
2014-07-22 11:01:32 +02:00
2014-04-19 23:21:51 +08:00
2014-05-21 15:50:15 +10:00