Skip to content
Commit 02eaa57b authored by Peter Simons's avatar Peter Simons
Browse files

merge latest changes from trunk 

svn path=/nixpkgs/branches/stdenv-updates/; revision=32270
parent f7886ac7
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