Merge commit 'refs/top-bases/experimental/multiple-versions-in-one-file' into experimental/multiple-versions-in-one-file

* commit 'refs/top-bases/experimental/multiple-versions-in-one-file': (77 commits)
  chromium: Install libffmpegsumo.so.
  Scribus minor update, modifying dependencies.
  Hunspell upgrade.
  LyX: add support for spell checking via enchant.
  linux/manual-config: Fix depmod step, remove false comment
  xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE
  Add xvfb-run, a wrapper script for Xvfb.
  Add selenium python package
  git: Update to 1.7.11.4
  awesome: update to 3.4.13
  linux: Update to 3.2.26
  django: Fix URL in src.
  haskell-shelly: update to version 0.14.0.1
  haskell-multiplate: update to version 0.0.2
  haskell-irc: update to version 0.5.1.0
  haskell-accelerate-cuda: update to version 0.12.1.1
  Add package haskell-digestive-functors-heist
  Lilypond: update to 2.14.2
  go: patching it to get the nixos cacert bundle taken just fine
  surf: updating to 0.5, and making it build.
  ...
Merge branch 'experimental/multiple-versions-in-one-file' into refs/top-bases/experimental/php

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

* refs/remotes/gh/experimental/php:
  update php
  php 5.2 fpm support
  New TopGit dependency: experimental/multiple-versions-in-one-file
  add mergeAttrsByVersion to this topic branch
  update php-apc
  PHP one file - because they share that much
  new tg branch experimental/php
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

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

* commit 'refs/top-bases/experimental/opera': (77 commits)
  chromium: Install libffmpegsumo.so.
  Scribus minor update, modifying dependencies.
  Hunspell upgrade.
  LyX: add support for spell checking via enchant.
  linux/manual-config: Fix depmod step, remove false comment
  xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE
  Add xvfb-run, a wrapper script for Xvfb.
  Add selenium python package
  git: Update to 1.7.11.4
  awesome: update to 3.4.13
  linux: Update to 3.2.26
  django: Fix URL in src.
  haskell-shelly: update to version 0.14.0.1
  haskell-multiplate: update to version 0.0.2
  haskell-irc: update to version 0.5.1.0
  haskell-accelerate-cuda: update to version 0.12.1.1
  Add package haskell-digestive-functors-heist
  Lilypond: update to 2.14.2
  go: patching it to get the nixos cacert bundle taken just fine
  surf: updating to 0.5, and making it build.
  ...
Merge branch 'experimental/opera' into refs/top-bases/experimental/marc

* experimental/opera:
Merge commit 'refs/top-bases/experimental/opencascade' into experimental/opencascade

* commit 'refs/top-bases/experimental/opencascade': (77 commits)
  chromium: Install libffmpegsumo.so.
  Scribus minor update, modifying dependencies.
  Hunspell upgrade.
  LyX: add support for spell checking via enchant.
  linux/manual-config: Fix depmod step, remove false comment
  xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE
  Add xvfb-run, a wrapper script for Xvfb.
  Add selenium python package
  git: Update to 1.7.11.4
  awesome: update to 3.4.13
  linux: Update to 3.2.26
  django: Fix URL in src.
  haskell-shelly: update to version 0.14.0.1
  haskell-multiplate: update to version 0.0.2
  haskell-irc: update to version 0.5.1.0
  haskell-accelerate-cuda: update to version 0.12.1.1
  Add package haskell-digestive-functors-heist
  Lilypond: update to 2.14.2
  go: patching it to get the nixos cacert bundle taken just fine
  surf: updating to 0.5, and making it build.
  ...
Merge branch 'experimental/opencascade' into refs/top-bases/experimental/marc

* experimental/opencascade:
Merge commit 'refs/top-bases/experimental/nodejs' into experimental/nodejs

* commit 'refs/top-bases/experimental/nodejs': (77 commits)
  chromium: Install libffmpegsumo.so.
  Scribus minor update, modifying dependencies.
  Hunspell upgrade.
  LyX: add support for spell checking via enchant.
  linux/manual-config: Fix depmod step, remove false comment
  xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE
  Add xvfb-run, a wrapper script for Xvfb.
  Add selenium python package
  git: Update to 1.7.11.4
  awesome: update to 3.4.13
  linux: Update to 3.2.26
  django: Fix URL in src.
  haskell-shelly: update to version 0.14.0.1
  haskell-multiplate: update to version 0.0.2
  haskell-irc: update to version 0.5.1.0
  haskell-accelerate-cuda: update to version 0.12.1.1
  Add package haskell-digestive-functors-heist
  Lilypond: update to 2.14.2
  go: patching it to get the nixos cacert bundle taken just fine
  surf: updating to 0.5, and making it build.
  ...
Merge branch 'experimental/nodejs' into refs/top-bases/experimental/marc

* experimental/nodejs:
Merge remote-tracking branch 'refs/remotes/gh/experimental/marc' into HEAD

* refs/remotes/gh/experimental/marc:
  fix
  updating fossil
  New TopGit dependency: experimental/nodejs
  New TopGit dependency: experimental/opencascade
  New TopGit dependency: experimental/opera
  texmacs: gnuplot fix + parallel building
  New TopGit dependency: experimental/shadow
  New TopGit dependency: experimental/urweb
  New TopGit dependency: experimental/firebird
  New TopGit dependency: experimental/gutenprint
  New TopGit dependency: experimental/multi-shell-support
  New TopGit dependency: experimental/php
  New TopGit dependency: experimental/hack-nix
  new tg branch experimental/marc