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-31 11:34:46 +02:00
2016-05-22 10:05:37 +01:00
2016-05-04 20:31:38 +01:00
2015-09-22 20:23:23 +02:00
2012-05-11 21:42:00 +00:00