improve message
nixos was merged into nixpkgs
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
  improve message
Merge branch 'marc-nixos/minimal-install-archive' into refs/top-bases/experimental/marc

* marc-nixos/minimal-install-archive:
  nixos was merged into nixpkgs
Merge commit 'refs/top-bases/experimental/php-koellner-phonetic' into experimental/php-koellner-phonetic

* commit 'refs/top-bases/experimental/php-koellner-phonetic':
  improve message
Merge branch 'experimental/php-koellner-phonetic' into refs/top-bases/experimental/marc

* experimental/php-koellner-phonetic:
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  nixos was merged into nixpkgs
  improve message
fix everything Eelco and iElectric found to be improved
Merge branch 'submit/firebird' into experimental/firebird

* submit/firebird:
  fix everything Eelco and iElectric found to be improved

Conflicts:
	nixos/modules/services/databases/firebird.nix
Merge branch 'experimental/firebird' into refs/top-bases/experimental/marc

* experimental/firebird:
  fix everything Eelco and iElectric found to be improved
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  fix everything Eelco and iElectric found to be improved
further improvements
Merge branch 'experimental/vsftpd' into refs/top-bases/experimental/marc

* experimental/vsftpd:
  further improvements
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  further improvements