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 14:49:52 +03:00
2016-08-31 21:13:12 +03:00
2016-03-14 23:46:01 +00:00
2016-01-30 16:36:57 +00:00
2016-08-29 19:52:40 +01:00
2016-01-27 09:28:59 +01:00
2015-12-23 22:08:33 +00:00