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-05-05 22:03:50 +02:00
2013-04-26 12:51:46 +02:00
2013-04-12 15:27:13 +02:00
2013-01-28 11:35:03 +08:00
2013-05-06 11:06:59 +00:00
2013-05-07 12:19:38 +02:00
2013-04-06 08:20:27 +02:00
2013-03-29 18:32:58 +01:00
2013-02-05 11:36:18 +08:00