Tuomas Tynkkynen 8c4aeb1780 Merge staging into master ... Brings in: - changed output order for multiple outputs: https://github.com/NixOS/nixpkgs/pull/14766 - audit disabled by default https://github.com/NixOS/nixpkgs/pull/17916 Conflicts: pkgs/development/libraries/openldap/default.nix		2016-09-01 13:27:27 +03:00
..
languages-frameworks	Doc: improve python bdist_wheel fix	2016-08-30 17:16:49 +02:00
old	Fix #4210: Remove builderDefs	2016-08-31 11:34:46 +02:00
coding-conventions.xml
configuration.xml
contributing.xml
default.nix
functions.xml
introduction.md
manual.xml
meta.xml
multiple-output.xml	doc: Document changes to multiple-output conventions	2016-08-30 04:46:59 +03:00
package-notes.xml
quick-start.xml
release-notes.xml
stdenv.xml	Merge pull request #9607 from nckx/update-doc	2016-08-31 10:02:16 +02:00
style.css
submitting-changes.xml