Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
  fix xdebug path following upstream which is build by pecl now
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  fix xdebug path following upstream which is build by pecl now
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/marc' into refs/top-bases/experimental/marc

* refs/remotes/gh/top-bases/experimental/marc: (1223 commits)
  man-pages: Update to 3.70
  Containers: Fix all-containers.service start
  update minecraft-server to 1.7.10
  haskell-haskoin: add 0.1.0.2
  haskell-json-rpc: add 0.2.0.1
  pulseaudio: fix CVE-2014-3970 by upstream patch
  Remove old comment, and delete confusing LaunchDaemon
  Containers: Use systemd startup notification
  Containers: Use systemd-nspawn startup notification
  Containers: Clean up veth interfaces
  Containers: Don't remount /
  Containers: Fix reboot and poweroff
  nixos-container: Allow auto-starting containers
  Autostart containers at boot time
  nixos-container: Add status command
  haskellPackages.xlsx: New expression
  nixUnstable: Update to nix-1.8pre3748_02843ba
  adom: various fixes
  Add haskell-network-uri-2.6.0.0
  linux: Enable ACLs in ext3
  ...
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD

* refs/remotes/gh/experimental/marc: (118 commits)
  firebird group
  New TopGit dependency: experimental/apache-httpd
  New TopGit dependency: experimental/nginx
  mutt
  gplv2 -> gpl2
  fix
  rdesktop keep old versions because it works with VirtualBox
  New TopGit dependency: experimental/clawsmail
  myhasktags update
  fix tigervnc ctrl-* keys, eg ctrl-c ctrl-v ctrl-d by applying patch to fltk
  fix, why did this happen ?
  adding whatsapp plugin
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  Revert "nscd: Fix LD_LIBRARY_PATH"
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  tgDel: removing dependency refs/heads/experimental/marc. Probably this topic was merged upstream (?)
  xsbt is outdated
  ...
Merge commit '688738d33ae8e8448099a4f577ddebadc86d1253' into experimental/marc

* commit '688738d33ae8e8448099a4f577ddebadc86d1253': (1223 commits)
  man-pages: Update to 3.70
  Containers: Fix all-containers.service start
  update minecraft-server to 1.7.10
  haskell-haskoin: add 0.1.0.2
  haskell-json-rpc: add 0.2.0.1
  pulseaudio: fix CVE-2014-3970 by upstream patch
  Remove old comment, and delete confusing LaunchDaemon
  Containers: Use systemd startup notification
  Containers: Use systemd-nspawn startup notification
  Containers: Clean up veth interfaces
  Containers: Don't remount /
  Containers: Fix reboot and poweroff
  nixos-container: Allow auto-starting containers
  Autostart containers at boot time
  nixos-container: Add status command
  haskellPackages.xlsx: New expression
  nixUnstable: Update to nix-1.8pre3748_02843ba
  adom: various fixes
  Add haskell-network-uri-2.6.0.0
  linux: Enable ACLs in ext3
  ...
follow upstream
Merge branch 'experimental/overlays' into refs/top-bases/experimental/updates

* experimental/overlays:
  follow upstream
Merge branch 'experimental/overlays' into refs/top-bases/experimental/hack-nix

* experimental/overlays:
  follow upstream
Merge commit 'refs/top-bases/experimental/hack-nix' into experimental/hack-nix

* commit 'refs/top-bases/experimental/hack-nix':
  follow upstream
Merge branch 'experimental/hack-nix' into refs/top-bases/experimental/updates

* experimental/hack-nix:
Merge commit 'refs/top-bases/experimental/updates' into experimental/updates

* commit 'refs/top-bases/experimental/updates':
  follow upstream
Merge branch 'experimental/updates' into refs/top-bases/experimental/marc

* experimental/updates:
  follow upstream
Merge branch 'experimental/overlays' into refs/top-bases/experimental/ruby

* experimental/overlays:
  follow upstream
Merge commit 'refs/top-bases/experimental/ruby' into experimental/ruby

* commit 'refs/top-bases/experimental/ruby':
  follow upstream
Merge branch 'experimental/ruby' into refs/top-bases/experimental/marc

* experimental/ruby:
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  follow upstream