Yury G. Kudryashov 84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby ...

svn path=/nixpkgs/branches/stdenv-updates/; revision=31721

2012-01-19 21:31:51 +00:00

..

2.4.0.nix

…

builder.sh

…

default.nix

…