Skip to content
Commit ea195b25 authored by Shea Levy's avatar Shea Levy
Browse files

svn merge ^/nixpkgs/trunk 

svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
parents 38e3d7bc 385f242a
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