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-06-26 02:05:45 +02:00
2015-11-15 03:41:39 +08:00
2016-08-29 17:50:06 +02:00
2016-08-30 12:28:13 +02:00
2014-03-10 15:01:56 +01:00
2016-02-26 22:15:40 +00:00
2016-02-26 22:15:41 +00:00