Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
..
2013-10-05 19:36:23 +02:00
2013-06-07 11:18:33 +02:00
2013-11-29 11:47:00 +01: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-10-06 12:01:38 +02:00
2013-01-28 17:19:01 +01:00
2013-12-09 13:25:07 -05: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-12-28 17:32:01 +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
2013-12-29 10:01:22 +01:00
2012-10-04 19:53:10 -04:00
2013-12-21 02:28:25 +02:00
2013-05-10 14:41:29 +02:00
2013-11-25 10:59:36 +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