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
..
2016-08-29 22:28:50 +02:00
2016-07-08 12:52:39 +03:00
2016-08-23 21:12:51 +02:00
2016-02-27 22:25:39 +13:00
2016-08-19 17:56:49 +03:00