Merge branch 'master' of https://github.com/NixOS/nixpkgs
Alexander Tsamutali 11 years ago a1a9c26c cc4c1089