Merge branch 'kmscon-extraoptions' of git://github.com/nathan7/nixpkgs
Shea Levy 10 years ago 06356c90 927e8221