Shea Levy 127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging ... Took "ours" for the conflict and changed libiconvOrEmpty to libiconv Conflicts: pkgs/applications/audio/ncmpcpp/default.nix		2015-02-11 19:37:22 -05:00
..
default.nix	Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging	2015-02-11 19:37:22 -05:00