fix command-t
Merge commit 'refs/top-bases/experimental/firebird' into experimental/firebird

* commit 'refs/top-bases/experimental/firebird': (4164 commits)
  vimprobable2, surf: fix the settings-schemas problem
  libnotify: major update, no dependency on gtk+ now
  rsyslog: enable TLS support
  Removed Xrender from cairo and add fontconfig to pango on Darwin: this fixes the compilation of graphviz and imagemagick on these platforms
  git: Adding -lgcc_s on darwin causes the build to fail, so we disable it for that platform
  Add rsyslog 7.2.6 and its dependencies
  Implemented an unelegant workaround that allows nodejs to be used on darwin using xcode
  A more complete fix of cyrus-sasl update (broken KDEs).
  gamin: adding a patch against a deadlock
  boost: properly quoting cflags parameters
  texinfo: update to version 5.1
  lzip: build the binary with -O3 and assertions disabled
  lzip: enable documentation build
  Make system identifier configurable (except for iphone targets)
  haskell-punycode: disable the test suite
  Add Catalyst::Action::REST perlPackage
  lzip: update to version 1.14
  haskell-wai-extra: update to version 1.3.3.1
  haskell-threads: update to version 0.5.0.2
  haskell-smallcheck: update to version 1.0.2
  ...

Conflicts:
	pkgs/servers/firebird/default.nix
Added forever-monitor nodejs package
Merge commit 'refs/top-bases/experimental/firebird' into experimental/firebird

* commit 'refs/top-bases/experimental/firebird': (2847 commits)
  Added forever-monitor nodejs package
  wine: upgrade to 1.6 + latest gecko/mono extensions
  Fix unneeded inherit
  Adding x-cape keyboard mapping helper
  Adding Lush: Lisp Universal SHell
  Make the setup-hook work again now that nodejs modules reside in lib/node_modules
  Add fs-walk node package + updated other nodejs packages
  nixpkgs-lint: Add support for filtering by maintainer
  Bump disnix,disnixos and dysnomia to latest development versions
  python-packages.nix: unsubscribe myself from some Hydra mails
  nose: run tests as noted in https://code.google.com/p/python-nose/issues/detail?id=387#c4
  Limnoria: update to 2013-06-01
  limnoria: add git as dependency, otherwise build fails
  VM builds: Update debian Wheezy image to v7.1.
  thttpd: New package, version 2.25b.
  fillDiskWithDebs: Create fake start-stop-daemon.
  nose: remove failing test
  git: find global configs in /etc/ instead of /etc
  gmvault: use logbook 0.4.2
  don't wrap scripts in EGG-INFO/scripts since they are called from python
  ...
firebird: document why I think its best to use internal icu package
New TopGit dependency: experimental/firebird
Merge remote-tracking branch 'refs/remotes/gh/experimental/overlays' into HEAD

* refs/remotes/gh/experimental/overlays:
  comment
  doc
  nix2/overlays implementation exported topgit branch
  new tg branch experimental/overlays
Merge branch 'experimental/overlays' into refs/top-bases/experimental/updates

* experimental/overlays:
  Added forever-monitor nodejs package
Merge branch 'experimental/overlays' into refs/top-bases/experimental/hack-nix

* experimental/overlays:
  Added forever-monitor nodejs package
Merge remote-tracking branch 'refs/remotes/gh/experimental/hack-nix' into HEAD

* refs/remotes/gh/experimental/hack-nix:
  try building ghc in parallel, it takes endlessly long anyway
  also comment ghc version in top-level
  core packages of most ghc compilers. comment 721 because of referenced issue -> comment
  new tg branch experimental/hack-nix
Merge branch 'experimental/hack-nix' into refs/top-bases/experimental/updates

* experimental/hack-nix:
Merge remote-tracking branch 'refs/remotes/gh/experimental/gimp-git' into HEAD

* refs/remotes/gh/experimental/gimp-git:
  fix zart
  update ufraw, add refocus-it
  gmic updates
  small refactoring, make zart compile again
  cleanup comments and spaces
  indent ufraw, share common code for gmic
  plugin updates
  updates
  plugin & gimp update
  latest git version of gimp
  follow upstream
  updating ufraw
  gimp update: still support old version required by gutenprintCVS
  gimp git, updating quite a lot of libraries - gimp segfaults on some operations and is slow myabe due to my ati ..
  add gegl,babl git versions
  new tg branch experimental/gimp-git
Merge branch 'experimental/gimp-git' into refs/top-bases/experimental/updates

* experimental/gimp-git:
Merge remote-tracking branch 'refs/remotes/gh/experimental/updates' into HEAD

* refs/remotes/gh/experimental/updates: (39 commits)
  update
  trying symlinks instead
  adding zimbu
  adding extundelete
  fix anyterm, fix merge issue, vim enable netbeans
  adding logkeys
  use master dvb-apps instead
  follow upstream
  support multiple vim sources
  fix typo
  adding slowhttptest
  fix vimnox
  adding taskwarrior
  fix
  adding missing patch
  drop merge failure
  fix mingw cross builds by using older compiler.
  openssl: fix mingw cross build by disabling patch
  adding dhex
  New TopGit dependency: experimental/gimp-git
  ...
Merge branch 'experimental/updates' into refs/top-bases/experimental/marc

* experimental/updates:
  Added forever-monitor nodejs package
Merge branch 'master' into refs/top-bases/experimental/php

* master:
  Added forever-monitor nodejs package
Merge remote-tracking branch 'refs/remotes/gh/experimental/multiple-versions-in-one-file' into HEAD

* refs/remotes/gh/experimental/multiple-versions-in-one-file:
  improve documentation
  set name by default
  comments
  documentation
  new tg branch experimental/multiple-versions-in-one-file
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: (43 commits)
  use --with-jpeg-dir otherwise PHP cannot create jpegs from string
  use gd shared always
  forgott to change hash
  follow upstream gd change
  improve documentation
  fix
  add upstream changes, put options in order of master
  hash patch was merged upstream (hash -> hashString)
  follow upstream etc change
  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
  ...
Merge branch 'experimental/php' into refs/top-bases/experimental/marc

* experimental/php: