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-08-26 14:28:56 +02:00
2013-04-10 17:39:09 +02:00
2013-12-21 00:05:38 +01:00
2013-11-23 11:09:09 +01:00
2013-09-17 16:41:15 +02:00
2012-07-27 19:27:25 -04:00
2013-09-01 16:46:21 +02:00