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-11 00:29:48 +09:00
2015-07-15 12:40:06 +02:00
2016-08-31 23:15:41 +03:00
2016-02-27 22:25:39 +13:00
2016-02-25 13:52:45 +00:00
2015-09-18 18:48:50 +00:00
2015-01-06 17:27:07 +03:00
2014-04-21 23:22:10 +02:00