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

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

* commit 'refs/top-bases/experimental/marc':
  patch
updates, todo
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
  updates, todo
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  updates, todo

Conflicts:
	pkgs/top-level/all-packages.nix
Merge remote-tracking branch 'refs/remotes/gh/top-bases/experimental/marc' into refs/top-bases/experimental/marc

* refs/remotes/gh/top-bases/experimental/marc:
  support multiple vim sources
  adding git version of imapsync
  New TopGit dependency: experimental/multiple-versions-in-one-file
  new tg branch experimental/imap-sync-update
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD

* refs/remotes/gh/experimental/marc: (55 commits)
  New TopGit dependency: experimental/imap-sync-update
  for whatever reason -DKBD* was ignored. systmed has --with-kbd-* options which work
  update zsh 5.0.0, make zprofile hack optional, sh and posix compatibility have been improved also it ships with sytemd completion
  update ati, make compile with 3.7 (gentoo patches)
  haxe-latest
  New TopGit dependency: experimental/ruby
  fix sort in lists.nix
  merge failure
  source of gupnp-igd is gone, too, use ubuntu source (launchpad) - same hash
  New TopGit dependency: experimental/eclipse
  2.6-2 moved to 2.6-3, so patches were not found
  libreoffice startup hack
  fix merge failure (hash)
  for eclipse use older cairo. With newer cairo Eclipse crashes after selecting a workspace
  Revert "cairo: Update to 1.12.4"
  New TopGit dependency: experimental/parallel-building
  reset jdk stuff to master. Don't know why it was different at all
  adding csound
  sox: parallelbuilding, flac, ogg support
  parallel building for sane
  ...

Conflicts:
	pkgs/top-level/all-packages.nix
Merge commit '16a5dc9' into experimental/marc

* commit '16a5dc9':
  support multiple vim sources
  New TopGit dependency: experimental/imap-sync-update
  adding git version of imapsync
  New TopGit dependency: experimental/multiple-versions-in-one-file
  new tg branch experimental/imap-sync-update
make gutenprint-cvs compile without internet access
Merge branch 'experimental/gutenprint' into refs/top-bases/experimental/marc

* experimental/gutenprint:
  make gutenprint-cvs compile without internet access
Merge commit 'refs/top-bases/experimental/marc' into experimental/marc

* commit 'refs/top-bases/experimental/marc':
  make gutenprint-cvs compile without internet access