updates
improve documentation
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/php

* experimental/multiple-versions-in-one-file:
  improve documentation
Merge remote-tracking branch 'refs/remotes/gh/experimental/php' into HEAD

* refs/remotes/gh/experimental/php: (34 commits)
  updates, todo
  patch
  fix php-fpm-5.2 startup
  socket & service
  update php 5.2 for testing
  resurrect php 5.2. Need to run old code
  php 5.2 no parallel
  don't depend on syslog.target, stop tracing
  privatetmp
  nicer shorter php id only based on config, update php-fpm-5.3 to make it work with systemd
  start rewriting jobs as systemd
  php fpm daemons: allow setting PHPRC to php ini file so that xdebug works
  typo2
  typo
  php fix
  php new sources
  extra pool lines
  php adding ldap support
  allow extra lines
  php with derivation specific id, only provide system_fpm_config if sapi=fpm
  ...
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php:
  improve documentation
Merge commit 'refs/top-bases/experimental/nodejs' into experimental/nodejs

* commit 'refs/top-bases/experimental/nodejs':
  improve documentation
Merge branch 'experimental/nodejs' into refs/top-bases/experimental/marc

* experimental/nodejs:
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/mingw

* experimental/multiple-versions-in-one-file:
  improve documentation
Merge commit 'refs/top-bases/experimental/mingw' into experimental/mingw

* commit 'refs/top-bases/experimental/mingw':
  improve documentation
Merge branch 'experimental/mingw' into refs/top-bases/experimental/marc

* experimental/mingw:
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/haxe

* experimental/multiple-versions-in-one-file:
  improve documentation
Merge commit 'refs/top-bases/experimental/haxe' into experimental/haxe

* commit 'refs/top-bases/experimental/haxe':
  improve documentation
Merge branch 'experimental/haxe' into refs/top-bases/experimental/marc

* experimental/haxe:
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/blender

* experimental/multiple-versions-in-one-file:
  improve documentation
Merge commit 'refs/top-bases/experimental/blender' into experimental/blender

* commit 'refs/top-bases/experimental/blender':
  improve documentation
Merge branch 'experimental/blender' into refs/top-bases/experimental/marc

* experimental/blender:
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/xsbt

* experimental/multiple-versions-in-one-file:
  improve documentation
Merge commit 'refs/top-bases/experimental/xsbt' into experimental/xsbt

* commit 'refs/top-bases/experimental/xsbt':
  improve documentation
Merge branch 'experimental/xsbt' into refs/top-bases/experimental/marc

* experimental/xsbt:
Merge commit 'refs/top-bases/experimental/imap-sync-update' into experimental/imap-sync-update

* commit 'refs/top-bases/experimental/imap-sync-update':
  improve documentation