Vladimír Čunát b5fba47147 Merge branch master into x-updates
Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix
2013-11-23 10:22:26 +01:00
..
2013-11-17 15:10:46 +01:00
2013-07-14 04:17:07 +03:00
2013-03-09 10:24:38 +01:00
2013-07-04 18:16:34 +02:00
2013-10-06 12:01:38 +02:00
2013-07-14 04:17:07 +03:00