kde installer: enable networkmanager. Closes #3433
docs: hint to stop NetworkManager during installation to manually configure the network
Update Tor to 0.2.5.10.

Updates Tor to latest stable version.

Add myself to the maintainer list.
haskell-greencard: add package
sbt: update to version 0.13.7
nixos/ids: Fix systemd ids
new package: pond
Merge pull request #4372 from drvirgilio/pond

new package: pond
agda-pretty: mark as broken

Broken by updating the stdlib to 0.9. For now I let the author know.
Revert "zmq: initial package"

This reverts commit b9c7f8dba1cf5a21166bac8c7a68e98067d18717.

Conflicts:
	pkgs/servers/zeromq/default.nix
	pkgs/top-level/all-packages.nix
fabric: update to 1.10.0
Merge pull request #5054 from j-keck/master

sbt: update to version 0.13.7
Add Ubuntu 14.10
Update to Debian 7.7
nasm: downgrade again until syslinux gets fixed

Syslinux won't compile with the new version http://hydra.nixos.org/build/17236670
We've already had one update+revert cycle before.
CC @psub.
openssh: Update to 6.7p1
Revert "Merge pull request #4693 from flosse/hplip-update"

This reverts commit 1b064645ed10a2bee70faec6896d4d33e2a86300, reversing
changes made to 14cef95e84e44a830b7317c095c7ffd6b9796fef.

As discussed in the comments to the aforementioned pull request, while
the new version supports many new printer models, many components of the
driver are broken because of some corner cases in the Python wrapper. In
particular, the loader for the binary binary driver needed by many
middle- and high-end printers is broken, negating most of the value in
updating!
hplip: update license attribute
qvim: upgrade to 20140827 (stable)
qvim: add ttuegel to maintainers