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-10-05 19:36:23 +02:00
2013-06-07 11:18:33 +02:00
2013-03-26 22:52:54 +08:00
2013-10-05 19:36:23 +02:00
2013-06-04 11:30:32 +04:00
2013-10-09 10:30:44 -04:00
2012-12-13 15:53:24 +04:00
2012-04-12 11:57:43 +00:00
2011-04-13 06:31:45 +00:00
2013-11-06 10:41:02 +01:00
2013-10-06 12:01:38 +02:00
2013-01-28 17:19:01 +01:00
2013-03-11 10:47:21 +01:00
2013-10-14 11:55:59 +04:00
2013-07-01 15:39:39 +02:00
2013-11-16 20:32:44 +01:00
2013-10-06 12:01:38 +02:00
2012-03-19 13:16:35 +00:00
2013-10-19 18:07:20 +03:00
2013-01-28 18:31:17 +01:00
2012-10-04 19:53:10 -04:00
2013-08-11 17:13:46 +02:00
2013-05-10 14:41:29 +02:00
2013-10-13 10:34:55 +04:00
2013-11-21 23:22:06 +01:00
2013-10-21 21:46:55 +03:00
2013-08-16 23:45:01 +02:00
2013-08-16 23:45:01 +02:00
2013-10-06 12:01:38 +02:00
2013-10-05 20:59:34 +02:00
2013-05-12 22:46:41 +02:00