Merge remote-tracking branch 'official/stdenv-updates' into future
ment/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
	pkgs/os-specific/linux/kernel/linux-3.11.nix
	pkgs/os-specific/linux/kernel/linux-3.12.nix
	pkgs/os-specific/linux/kernel/linux-3.4.nix
	pkgs/servers/http/apache-httpd/2.4.nix
	pkgs/servers/nosql/rethinkdb/default.nix
	pkgs/tools/misc/less/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/tools/networking/p2p/amule/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/haskell-packages.nix
	pkgs/top-level/node-packages-generated.nix
	pkgs/top-level/node-packages.json
	pkgs/top-level/node-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix

Conflicts:
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
Merge remote-tracking branch 'official/glibc-2.18' into future

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix
	pkgs/development/libraries/ncurses/5_4.nix
Merge remote-tracking branch 'official/master'
Merge remote-tracking branch 'official/master'
Merge remote-tracking branch 'official/master'
calibre: upgrade from 1.15.0 to 1.17.0
Bump compton to v0.1_beta2
pythonPackages: add pyramid_debugtoolbar, robotframework_selenium2library, robotsuite and nose-selecttests
salut-a-toi: remove distribute dependency (not needed)
Fixed a code typo in the documentation
haskell-RSA: update to version 2.0
haskell-crypto-pubkey: update to version 0.2.4
haskell-digestive-functors-heist: update to version 0.8.4.0
haskell-fast-logger: update to version 2.0.3
haskell-fclabels: update to version 2.0.1
haskell-lens: update to version 3.10.1
haskell-wai-extra: update to version 2.0.1.1
haskell-wai-logger: update to version 2.0.2
haskell-yesod-static: update to version 1.2.2.1
build-support/cabal: recognize the "this package indirectly depends on
multiple versions of the same package" warning from Cabal and abort the
build if it occurs.