Merge commit 'refs/pull/13853/head' of git://github.com/NixOS/nixpkgs
Nikolay Amiantov 10 years ago 39ed265c 5e6798d7