Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
..
2012-12-13 10:07:18 +04:00
2012-10-04 20:11:47 -04:00
2012-12-13 15:53:24 +04:00
2012-04-12 11:57:43 +00:00
2013-03-16 21:08:57 +01:00
2013-01-28 18:31:17 +01:00
2013-01-28 17:19:01 +01:00
2012-11-29 13:43:37 +01:00
2013-03-11 10:47:21 +01:00
2013-02-05 11:24:00 +04:00
2013-02-23 14:57:31 +01:00
2012-09-02 09:06:30 +02:00
2012-03-19 13:16:35 +00:00
2013-01-28 18:31:17 +01:00
2013-01-22 12:58:07 -05:00
2012-10-04 19:53:10 -04:00
2013-03-10 19:53:43 +01:00