Vladimír Čunát b770365574 ReRevert Merge x-updates into master ... This reverts commit ec3965d8d0b5594a9db11e6c9cd1c28d36e91cde. Conflicts (taken x-updates): pkgs/development/libraries/libgcrypt/default.nix pkgs/development/libraries/libgpg-error/default.nix pkgs/development/libraries/poppler/default.nix		2013-05-29 23:25:02 +02:00
..
default.nix	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00