Skip to content
Commit 08761e83 authored by Yury G. Kudryashov's avatar Yury G. Kudryashov
Browse files

Merge trunk 

svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
parents f77741e0 7928d532
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment