fixed a patch which was rejected, i wonder why it was still there...
Merge branch 'master' of github.com:NixOS/nixpkgs
linux: Update to 3.2.50
linux: properly parse config choice when it's new
linux: update grsecurity patch
Merge branch 'master' of github.com:NixOS/nixpkgs
Update leiningen to 2.3.0.

Unfortunately, leiningen will now pull in some dependencies via maven (via http) on `lein version' so the test at the end of builder.sh failed. This is okay because leiningen is used only as a interactive tool and no other package in Nixpkgs depends on it.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
Add pycurl2, a Python interface to libcurl
pythonPackages: fix carbon, move dependecies to propagated build inputs
unclutter: add to channel
add orc 0.4.17
add libvisual 0.4.0
Merge pull request #819 from iyzsong/libvisual

add libvisual 0.4.0
Merge pull request #817 from offlinehacker/pythonPackages.carbon

pythonPackages: fix carbon, move dependecies to propagated build inputs
Merge pull request #816 from offlinehacker/pycurl2

Add pycurl2, a Python interface to libcurl
orc: add missing license (bsd3)
Merge pull request #812 from the-kenny/leiningen-2.3.0

Update leiningen to 2.3.0.
leiningen: fix hash
add myself to maintainers list, keep it sorted

orc: add myself as a maintainer
pythonPackages: fix graphite_web, make it usable