Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
..
2013-04-01 11:46:14 +02:00
2011-05-27 05:39:44 +00:00
2013-05-07 17:33:51 +02:00
2012-10-14 23:48:46 -07:00
2011-11-10 22:50:45 +00:00
2013-02-11 14:38:02 +01:00
2012-12-01 21:09:55 +01:00
2013-01-18 12:01:14 +01:00
2013-03-25 08:08:46 +01:00
2011-04-23 21:15:11 +00:00
2011-05-07 23:41:34 +00:00
2013-03-30 22:45:45 +01:00
2012-11-15 07:41:11 +01:00
2013-01-28 17:19:01 +01:00
2012-09-26 22:55:56 +02:00
2013-04-30 12:01:02 +03:00
2013-04-01 01:24:56 +02:00
2012-10-02 11:52:37 -04:00
2012-01-26 15:27:03 +00:00